From 5eee4c060733e71acab5e50ccca11ec04edcfcbe Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 12 May 2017 19:17:23 +0100 Subject: [PATCH] pkg/runc: WORKDIR as first item in second stage Works around https://github.com/moby/moby/issues/33176 and fixes #1807. Updated al users of linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 to this new build. Signed-off-by: Ian Campbell --- 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 +- pkg/runc/Dockerfile | 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 +- test/cases/test-docker-bench.yml | 2 +- test/cases/test-kernel-config.yml | 2 +- test/cases/test-ltp.yml | 2 +- test/cases/test-virtsock-server.yml | 2 +- test/kmod/kmod.yml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/docker.yml b/examples/docker.yml index 58a9a4295..ab9de438e 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/examples/gcp.yml b/examples/gcp.yml index 843a80ad1..ec237e612 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/examples/minimal.yml b/examples/minimal.yml index 3b7e27ce2..1cb407f87 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f onboot: - name: dhcpcd diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index f513020a6..c02502486 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d services: - name: rngd diff --git a/examples/packet.yml b/examples/packet.yml index eef4e137d..5cf26d682 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS1 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 3a8c05071..d9ff6ada8 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -5,7 +5,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f services: - name: dhcpcd diff --git a/examples/sshd.yml b/examples/sshd.yml index c13a6e137..6c63e65dd 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/examples/swap.yml b/examples/swap.yml index 0c2403382..cba09e3ee 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:42fe8cb1508b3afed39eb89821906e3cc7a70551 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: diff --git a/examples/vmware.yml b/examples/vmware.yml index 8667e94d7..79b3a047c 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=tty0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/linuxkit.yml b/linuxkit.yml index 0ab273b46..9815df2b5 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index b92e6d9d1..e65963330 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -22,6 +22,6 @@ RUN make static BUILDTAGS="seccomp" RUN cp runc /usr/bin/ FROM scratch -ENTRYPOINT [] WORKDIR / +ENTRYPOINT [] COPY --from=alpine /usr/bin/runc /usr/bin/ diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 184f2371b..2b312a8a7 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 1ed4f3901..fb2f55307 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 393cf5ad3..51a3fce38 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 87cc7f1cf..c13f225f7 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:062e57b1d1e017e44c6339fc2b4cd41f3f10b2a9 # with runc, logwrite, startmemlogd - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 7641b72eb..9a295cbcc 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/test/cases/test-docker-bench.yml b/test/cases/test-docker-bench.yml index c2872ca71..e01db25a5 100644 --- a/test/cases/test-docker-bench.yml +++ b/test/cases/test-docker-bench.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/test/cases/test-kernel-config.yml b/test/cases/test-kernel-config.yml index 3e849ee87..8f2c6a2f6 100644 --- a/test/cases/test-kernel-config.yml +++ b/test/cases/test-kernel-config.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/test/cases/test-ltp.yml b/test/cases/test-ltp.yml index 9a30e1700..543d4e9c3 100644 --- a/test/cases/test-ltp.yml +++ b/test/cases/test-ltp.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/test/cases/test-virtsock-server.yml b/test/cases/test-virtsock-server.yml index 8fad1201e..0f9df7e56 100644 --- a/test/cases/test-virtsock-server.yml +++ b/test/cases/test-virtsock-server.yml @@ -7,7 +7,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 onboot: diff --git a/test/kmod/kmod.yml b/test/kmod/kmod.yml index 8029c234c..6ee81d0e9 100644 --- a/test/kmod/kmod.yml +++ b/test/kmod/kmod.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 + - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f onboot: - name: check