From 007db062f0c39bf31e1150aa26d045778ab7d24e Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 31 Oct 2017 11:50:29 -0400 Subject: [PATCH] Add containerd static compile Fixes #35349 Signed-off-by: Michael Crosby --- hack/dockerfile/install-binaries.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/hack/dockerfile/install-binaries.sh b/hack/dockerfile/install-binaries.sh index 0a45ef9b8c..e97385ebcc 100755 --- a/hack/dockerfile/install-binaries.sh +++ b/hack/dockerfile/install-binaries.sh @@ -34,7 +34,21 @@ install_containerd() { git checkout -q "$CONTAINERD_COMMIT" ( export GOPATH - make $1 + make + ) + cp bin/containerd /usr/local/bin/docker-containerd + cp bin/containerd-shim /usr/local/bin/docker-containerd-shim + cp bin/ctr /usr/local/bin/docker-containerd-ctr +} + +install_containerd_static() { + echo "Install containerd version $CONTAINERD_COMMIT" + git clone https://github.com/containerd/containerd.git "$GOPATH/src/github.com/containerd/containerd" + cd "$GOPATH/src/github.com/containerd/containerd" + git checkout -q "$CONTAINERD_COMMIT" + ( + export GOPATH + make EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\"" ) cp bin/containerd /usr/local/bin/docker-containerd cp bin/containerd-shim /usr/local/bin/docker-containerd-shim @@ -106,7 +120,7 @@ do ;; containerd) - install_containerd + install_containerd_static ;; containerd-dynamic)