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

Add crictl cli to install deps

Browse Source 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
This commit is contained in:
Abhinandan Prativadi 2017-09-17 11:29:59 -07:00
parent 9d8f74227f
commit e4077e915b
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/install-deps.sh
View File

@ -52,7 +52,7 @@ CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
RUNC_PKG=github.com/opencontainers/runc RUNC_PKG=github.com/opencontainers/runc
CNI_PKG=github.com/containernetworking/plugins CNI_PKG=github.com/containernetworking/plugins
CONTAINERD_PKG=github.com/containerd/containerd CONTAINERD_PKG=github.com/containerd/containerd
CRITOOL_PKG=github.com/kubernetes-incubator/cri-tools
# Check GOPATH # Check GOPATH
if [[ -z "${GOPATH}" ]]; then if [[ -z "${GOPATH}" ]]; then
echo "GOPATH is not set" echo "GOPATH is not set"
@ -125,3 +125,8 @@ checkout_repo ${CONTAINERD_PKG} ${CONTAINERD_VERSION}
cd ${GOPATH}/src/${CONTAINERD_PKG} cd ${GOPATH}/src/${CONTAINERD_PKG}
make make
${sudo} make install -e DESTDIR=${CONTAINERD_DIR} ${sudo} make install -e DESTDIR=${CONTAINERD_DIR}
#Install crictl
checkout_repo ${CRITOOL_PKG} ${CRITOOL_VERSION}
cd ${GOPATH}/src/${CRITOOL_PKG}
make

2
hack/release.sh
View File

@ -34,6 +34,8 @@ NOSUDO=true DESTDIR=${destdir} ./hack/install-deps.sh
# Install cri-containerd into release stage. # Install cri-containerd into release stage.
make install -e DESTDIR=${destdir} make install -e DESTDIR=${destdir}
# Copy crictl tool into release stage
cp ${GOPATH}/bin/crictl ${destdir}/usr/local/bin/
# Install systemd units into release stage. # Install systemd units into release stage.
mkdir -p ${destdir}/etc/systemd/system mkdir -p ${destdir}/etc/systemd/system
cp ${ROOT}/contrib/systemd-units/* ${destdir}/etc/systemd/system/ cp ${ROOT}/contrib/systemd-units/* ${destdir}/etc/systemd/system/

10
hack/test-cri.sh
View File

@ -21,7 +21,7 @@ source $(dirname "${BASH_SOURCE[0]}")/test-utils.sh
# FOCUS focuses the test to run. # FOCUS focuses the test to run.
FOCUS=${FOCUS:-} FOCUS=${FOCUS:-}
# SKIP skips the test to skip. # SKIP skips the test to skip.
SKIP=${SKIP:-""} SKIP=${SKIP:-"SeccompProfilePath"}
REPORT_DIR=${REPORT_DIR:-"/tmp/test-cri"} REPORT_DIR=${REPORT_DIR:-"/tmp/test-cri"}
# Check GOPATH # Check GOPATH
@ -34,15 +34,15 @@ fi
GOPATH=${GOPATH%%:*} GOPATH=${GOPATH%%:*}
CRITEST=${GOPATH}/bin/critest CRITEST=${GOPATH}/bin/critest
CRITEST_PKG=github.com/kubernetes-incubator/cri-tools CRITOOL_PKG=github.com/kubernetes-incubator/cri-tools
CRICONTAINERD_SOCK=/var/run/cri-containerd.sock CRICONTAINERD_SOCK=/var/run/cri-containerd.sock
# Install critest # Install critest
if [ ! -x "$(command -v ${CRITEST})" ]; then if [ ! -x "$(command -v ${CRITEST})" ]; then
go get -d ${CRITEST_PKG}/... go get -d ${CRITOOL_PKG}/...
cd ${GOPATH}/src/${CRITEST_PKG} cd ${GOPATH}/src/${CRITOOL_PKG}
git fetch --all git fetch --all
git checkout ${CRITEST_VERSION} git checkout ${CRITOOL_VERSION}
make make
fi fi
which ${CRITEST} which ${CRITEST}

2
hack/versions
View File

@ -1,5 +1,5 @@
RUNC_VERSION=593914b8bd5448a93f7c3e4902a03408b6d5c0ce RUNC_VERSION=593914b8bd5448a93f7c3e4902a03408b6d5c0ce
CNI_VERSION=v0.6.0 CNI_VERSION=v0.6.0
CONTAINERD_VERSION=0cb2c961b2d41e46fbb94bfa165db6d6731b73d2 CONTAINERD_VERSION=0cb2c961b2d41e46fbb94bfa165db6d6731b73d2
CRITEST_VERSION=3028b837818133b4e83758cf9aee867f0a3ff6d2 CRITOOL_VERSION=046c028a5551b4c5d2a2e503eabeb238ccafe307
KUBERNETES_VERSION=11a836078d0c78a4253a77a3ff6f4a555c4121f9 KUBERNETES_VERSION=11a836078d0c78a4253a77a3ff6f4a555c4121f9