From 515b25d518b2a92f0b6b91fc4736f852bed242a0 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 10 May 2017 11:00:35 +0100 Subject: [PATCH 1/2] Do not make directories These should now be in the image. Signed-off-by: Justin Cormack --- pkg/init/etc/init.d/rcS | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/init/etc/init.d/rcS b/pkg/init/etc/init.d/rcS index deab744ff..339a428ba 100755 --- a/pkg/init/etc/init.d/rcS +++ b/pkg/init/etc/init.d/rcS @@ -1,8 +1,6 @@ #!/bin/sh # mount filesystems -mkdir -p -m 0755 /proc /run /tmp /sys /dev - mount -n -t proc proc /proc -o nodev,nosuid,noexec,relatime mount -n -t tmpfs tmpfs /run -o nodev,nosuid,noexec,relatime,size=10%,mode=755 From b14f8a233700b80dda5a4b460e0da7c51ca28bd5 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 10 May 2017 11:39:29 +0100 Subject: [PATCH 2/2] Update yaml files with new init Note these are only the ones using the `containerd` based `init` as the `runc` ones are still using an old one. Signed-off-by: Justin Cormack --- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- linuxkit.yml | 2 +- projects/etcd/etcd.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/minimal.yml b/examples/minimal.yml index c50067013..4669e9d22 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c + - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:987b62d8411bc92f092e6e6e8d1038c4e06f0a53 onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 66c287eec..0843ef89e 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c + - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d services: diff --git a/linuxkit.yml b/linuxkit.yml index f3f88a20c..16578aba8 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c + - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:987b62d8411bc92f092e6e6e8d1038c4e06f0a53 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index cab6983d6..cc423dcce 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c + - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288