diff --git a/examples/docker.yml b/examples/docker.yml index ef4435026..58a9a4295 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/examples/gcp.yml b/examples/gcp.yml index 5e0eec571..843a80ad1 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/examples/minimal.yml b/examples/minimal.yml index c026ce6d7..3b7e27ce2 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:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 0843ef89e..f513020a6 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:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d services: diff --git a/examples/packet.yml b/examples/packet.yml index 5b7ccd65d..eef4e137d 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS1 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index e0bcfc06e..3a8c05071 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f services: diff --git a/examples/sshd.yml b/examples/sshd.yml index 8fa7a67be..c13a6e137 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/examples/vmware.yml b/examples/vmware.yml index aea23b03e..8667e94d7 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/linuxkit.yml b/linuxkit.yml index 2fce737fc..0ab273b46 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:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 5ef49b03f..b4550ae9f 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -3,4 +3,5 @@ FROM alpine:edge@sha256:99588bc8883c955c157d18fc3eaa4a3c1400c223e6c7cabca5f600a3 ENTRYPOINT [] CMD [] WORKDIR / -COPY . ./ +COPY init / +COPY etc etc/ diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 77ed4534a..4e067c050 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel-clear-containers:4.9.x" cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 onboot: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index cc423dcce..184f2371b 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:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/projects/etcd/prom-us-central1-f.yml b/projects/etcd/prom-us-central1-f.yml index e0507237f..a4d12e6f3 100644 --- a/projects/etcd/prom-us-central1-f.yml +++ b/projects/etcd/prom-us-central1-f.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index f1af394b9..1ed4f3901 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index a06899096..393cf5ad3 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 871a9b711..a5ef227b4 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel-landlock:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 74516e273..7641b72eb 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/okernel:latest" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/test/cases/test-docker-bench.yml b/test/cases/test-docker-bench.yml index f835cbf76..c2872ca71 100644 --- a/test/cases/test-docker-bench.yml +++ b/test/cases/test-docker-bench.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/test/cases/test-kernel-config.yml b/test/cases/test-kernel-config.yml index 4ad7b75d2..3e849ee87 100644 --- a/test/cases/test-kernel-config.yml +++ b/test/cases/test-kernel-config.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/test/cases/test-ltp.yml b/test/cases/test-ltp.yml index 1db68d33d..9a30e1700 100644 --- a/test/cases/test-ltp.yml +++ b/test/cases/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/test/cases/test-virtsock-server.yml b/test/cases/test-virtsock-server.yml index e2189b2f1..8fad1201e 100644 --- a/test/cases/test-virtsock-server.yml +++ b/test/cases/test-virtsock-server.yml @@ -6,7 +6,7 @@ kernel: # image: "linuxkit/kernel:4.4.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 diff --git a/test/kmod/kmod.yml b/test/kmod/kmod.yml index 473988040..8029c234c 100644 --- a/test/kmod/kmod.yml +++ b/test/kmod/kmod.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f + - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f onboot: