Merge pull request #537 from Random-Liu/fix-install-deps

Pass PATH for containerd sudo make install.
This commit is contained in:
Lantao Liu 2018-01-11 15:18:03 -08:00 committed by GitHub
commit 8e836140bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -135,7 +135,9 @@ fi
checkout_repo ${CONTAINERD_PKG} ${CONTAINERD_VERSION} ${CONTAINERD_REPO} checkout_repo ${CONTAINERD_PKG} ${CONTAINERD_VERSION} ${CONTAINERD_REPO}
cd ${GOPATH}/src/${CONTAINERD_PKG} cd ${GOPATH}/src/${CONTAINERD_PKG}
make make
${sudo} make install -e DESTDIR=${CONTAINERD_DIR} # containerd make install requires `go` to work. Explicitly
# set PATH to make sure it can find `go` even with `sudo`.
${sudo} sh -c "PATH=${PATH} make install -e DESTDIR=${CONTAINERD_DIR}"
#Install crictl #Install crictl
checkout_repo ${CRITOOL_PKG} ${CRITOOL_VERSION} checkout_repo ${CRITOOL_PKG} ${CRITOOL_VERSION}