github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1180 from Random-Liu/fix-version

Browse Source 
Fix runc and critools version in release.
This commit is contained in:
Lantao Liu
2019-06-21 08:37:55 -07:00
committed by GitHub
parent 806c2641a1 6afd137c02
commit eaf792ed7b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/install/install-critools.sh
View File

@@ -29,7 +29,7 @@ GOPATH=${TMPGOPATH}
#Install crictl #Install crictl
checkout_repo ${CRITOOL_PKG} ${CRITOOL_VERSION} ${CRITOOL_REPO} checkout_repo ${CRITOOL_PKG} ${CRITOOL_VERSION} ${CRITOOL_REPO}
cd ${GOPATH}/src/${CRITOOL_PKG} cd ${GOPATH}/src/${CRITOOL_PKG}
make make VERSION=${CRITOOL_VERSION}
${SUDO} make install -e BINDIR=${CRITOOL_DIR} GOPATH=${GOPATH} ${SUDO} make install -e BINDIR=${CRITOOL_DIR} GOPATH=${GOPATH}
${SUDO} mkdir -p ${CRICTL_CONFIG_DIR} ${SUDO} mkdir -p ${CRICTL_CONFIG_DIR}
${SUDO} bash -c 'cat >'${CRICTL_CONFIG_DIR}'/crictl.yaml <<EOF ${SUDO} bash -c 'cat >'${CRICTL_CONFIG_DIR}'/crictl.yaml <<EOF

2
hack/install/install-runc.sh
View File

@@ -30,7 +30,7 @@ GOPATH=${TMPGOPATH}
from-vendor RUNC github.com/opencontainers/runc from-vendor RUNC github.com/opencontainers/runc
checkout_repo ${RUNC_PKG} ${RUNC_VERSION} ${RUNC_REPO} checkout_repo ${RUNC_PKG} ${RUNC_VERSION} ${RUNC_REPO}
cd ${GOPATH}/src/${RUNC_PKG} cd ${GOPATH}/src/${RUNC_PKG}
make static BUILDTAGS="$BUILDTAGS" make static BUILDTAGS="$BUILDTAGS" VERSION=${RUNC_VERSION}
${SUDO} make install -e DESTDIR=${RUNC_DIR} ${SUDO} make install -e DESTDIR=${RUNC_DIR}
# Clean the tmp GOPATH dir. Use sudo because runc build generates # Clean the tmp GOPATH dir. Use sudo because runc build generates