Merge pull request #184 from devimc/topic/fixSnap130

snap: fix snapcraft.yaml for kata-container 1.3.0
This commit is contained in:
Jose Carlos Venegas Munoz 2018-09-14 14:23:05 -05:00 committed by GitHub
commit 4b8f97c1ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -57,7 +57,7 @@ parts:
export GOPATH=$(realpath ../go)
cd ${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/proxy
make
make install LIBEXECDIR=${SNAPCRAFT_PART_INSTALL}/usr/libexec
make install DESTDIR=${SNAPCRAFT_PART_INSTALL}
shim:
source: http://github.com/kata-containers/shim
@ -101,8 +101,7 @@ parts:
sed -i 's|^GO_VERSION=.*|GO_VERSION='$(go version | cut -d' ' -f3 | tr -d go)'|g' rootfs-builder/versions.txt
sudo -E PATH=$PATH make DISTRO=alpine USE_DOCKER=true AGENT_VERSION=${SNAPCRAFT_PROJECT_VERSION} AGENT_INIT=yes rootfs
sudo -E PATH=$PATH make DISTRO=alpine AGENT_INIT=yes initrd-only
sudo -E PATH=$PATH make DISTRO=alpine AGENT_INIT=yes USE_DOCKER=1 initrd
kata_image_dir=${SNAPCRAFT_PART_INSTALL}/usr/share/kata-containers
mkdir -p ${kata_image_dir}