From 6f788999956e8245a9f33b337036584277d6f372 Mon Sep 17 00:00:00 2001 From: Robin Winkelewski Date: Wed, 13 Dec 2017 20:46:24 +0100 Subject: [PATCH 1/2] move socat to cri-containerd container Signed-off-by: Robin Winkelewski --- pkg/cri-containerd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cri-containerd/Dockerfile b/pkg/cri-containerd/Dockerfile index b5df7f9..bd1fd78 100644 --- a/pkg/cri-containerd/Dockerfile +++ b/pkg/cri-containerd/Dockerfile @@ -10,7 +10,6 @@ RUN \ libseccomp-dev \ linux-headers \ make \ - socat \ && true ENV GOPATH=/go PATH=$PATH:/go/bin @@ -39,6 +38,7 @@ RUN apk add --no-cache --initdb -p /out \ ca-certificates \ iptables \ util-linux \ + socat \ && true # Remove apk residuals. We have a read-only rootfs, so apk is of no use. RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache From 6334e667d91d4fea766ab46c7f54f46c7351c0cd Mon Sep 17 00:00:00 2001 From: Robin Winkelewski Date: Thu, 14 Dec 2017 06:11:51 +0100 Subject: [PATCH 2/2] bump cri-containerd Signed-off-by: Robin Winkelewski --- yml/cri-containerd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yml/cri-containerd.yml b/yml/cri-containerd.yml index 04b15da..1692dd0 100644 --- a/yml/cri-containerd.yml +++ b/yml/cri-containerd.yml @@ -1,6 +1,6 @@ services: - name: cri-containerd - image: linuxkit/cri-containerd:13e866007004e919de34eccf828144a3be9c9741 + image: linuxkit/cri-containerd:179d9a1087d615f3a628e47a73243f8e56fb1440 cgroupsPath: podruntime/runtime files: - path: /etc/kubelet.sh.conf