From c6e5ff83e0afc14a3cce9e918bcb32290e8043d9 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 19 May 2017 11:32:37 +0100 Subject: [PATCH 1/2] Update containerd - use new Makefile flags to add our build flags correctly now - restore `dist` for now as it is useful for testing still, for now Will remove both `dist` and `ctr` once we have our own tool, but will add them to dev container instead. Signed-off-by: Justin Cormack --- pkg/containerd/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index c3a430e4a..ea5e16d24 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -10,13 +10,13 @@ RUN \ make \ && true ENV GOPATH=/root/go -ENV CONTAINERD_COMMIT=b53105ed253b99f8b63809e704f23819dce9776e +ENV CONTAINERD_COMMIT=0f0f3b69dcba2efeba012ff55e2a596f12cf0bac RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git WORKDIR $GOPATH/src/github.com/containerd/containerd RUN git checkout $CONTAINERD_COMMIT -RUN make binaries GO_GCFLAGS="-buildmode pie --ldflags '-extldflags \"-fno-PIC -static\"'" +RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\"" RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/ WORKDIR / COPY . . @@ -24,5 +24,5 @@ COPY . . FROM scratch ENTRYPOINT [] WORKDIR / -COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/ +COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /usr/bin/ COPY --from=alpine /etc/containerd/config.toml /etc/containerd/ From a3ea4646e51f89482476743677bd7520d718197b Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 19 May 2017 11:52:12 +0100 Subject: [PATCH 2/2] Update containerd in yaml files Signed-off-by: Justin Cormack --- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- linuxkit.yml | 2 +- projects/etcd/etcd.yml | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/logging/examples/logging.yml | 2 +- projects/okernel/examples/okernel_simple.yaml | 2 +- projects/swarmd/swarmd.yml | 2 +- test/cases/000_build/000_outputs/test.yml | 2 +- test/cases/020_kernel/000_config/test-kernel-config.yml | 2 +- test/cases/020_kernel/010_kmod/kmod.yml | 2 +- test/cases/030_security/000_docker-bench/test-docker-bench.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/docker.yml b/examples/docker.yml index cf8b9244e..4c3b5503c 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 97c8109c8..10ad35212 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index 65332b9f6..8e88e0623 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:cb96c09a33c166eca6530f166f0f79927c3e83b0" diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 0bcda46fd..897a2514f 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 services: - name: rngd image: "linuxkit/rngd:c97ef16be340884a985d8b025983505a9bcc51f0" diff --git a/examples/packet.yml b/examples/packet.yml index 66c6f81a7..4293ce4a0 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 060f9de26..37015d830 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 services: - name: dhcpcd image: "linuxkit/dhcpcd:cb96c09a33c166eca6530f166f0f79927c3e83b0" diff --git a/examples/sshd.yml b/examples/sshd.yml index b641eb083..c7dd7870d 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index 710bd03ee..221bbd9f8 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42fe8cb1508b3afed39eb89821906e3cc7a70551 - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index 652c9c095..5348d3d6a 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 244c12223..0507f94f1 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 51ca8b8dd..722a4db6c 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 6bc7d2808..55ccd039d 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 116ad1cf6..448b6dcf8 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 1a7627ba9..99401730f 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:062e57b1d1e017e44c6339fc2b4cd41f3f10b2a9 # with runc, logwrite, startmemlogd - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 29e11fb66..90b4d66e7 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 303055c71..b0303cd24 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index f1a271e8a..dcf25a7e8 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:cb96c09a33c166eca6530f166f0f79927c3e83b0" diff --git a/test/cases/020_kernel/000_config/test-kernel-config.yml b/test/cases/020_kernel/000_config/test-kernel-config.yml index 6c5509423..9667152fe 100644 --- a/test/cases/020_kernel/000_config/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: dhcpcd diff --git a/test/cases/020_kernel/010_kmod/kmod.yml b/test/cases/020_kernel/010_kmod/kmod.yml index 72d17485c..b8d32bf74 100644 --- a/test/cases/020_kernel/010_kmod/kmod.yml +++ b/test/cases/020_kernel/010_kmod/kmod.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 onboot: - name: check image: "kmod-test" diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml index 91f533a4b..1b462ff8f 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 5f94970da..f8fc3c653 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: ltp diff --git a/test/hack/test.yml b/test/hack/test.yml index 60b9b185b..5e5d53073 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01 + - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: dhcpcd