From f7b2a739eed5364ce11012439c871e75a103bb79 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 14 Jun 2017 15:34:07 +0100 Subject: [PATCH 1/4] pkg/getty: Stop bind mounting /tmp/ctr This doesn't exist with newer ctr or in systems where service containers are not started using the ctr tool. All it contains today are the stdio FIFOs, which are not in general useful to access after container creation. Signed-off-by: Ian Campbell --- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- linuxkit.yml | 2 +- pkg/getty/Dockerfile | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/docker.yml b/examples/docker.yml index 1b7a4e377..0893e5601 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -20,7 +20,7 @@ onboot: command: ["/mount.sh", "/var/lib/docker"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index 994a916bb..037b1d547 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,7 +16,7 @@ onboot: image: "linuxkit/metadata:31a0b0f5557c6123beaa9c33e3400ae3c03447e0" services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/getty.yml b/examples/getty.yml index 653f39f2c..7cd6f4fe7 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index e1280c0b3..ea0db8e2e 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -11,7 +11,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 186f426f7..bbba98361 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/redis-os.yml b/examples/redis-os.yml index d8facd09c..75f15f799 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -13,7 +13,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index ff70a9c9a..8eda6e34c 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -11,7 +11,7 @@ onboot: image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/swap.yml b/examples/swap.yml index d2bce7b68..089ca6fa7 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -24,7 +24,7 @@ onboot: command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/vmware.yml b/examples/vmware.yml index d7d753b32..e1e1440e5 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/linuxkit.yml b/linuxkit.yml index ebe376f2e..c89aa9fa1 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index 0292384cf..defd12c3f 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -28,4 +28,4 @@ COPY --from=mirror /out/ / COPY usr/ /usr/ COPY etc/ /etc/ CMD ["/usr/bin/rungetty.sh"] -LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/etc:/hostroot/etc","/tmp/ctr:/tmp/ctr", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' +LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 7dd4b8911..5286c4dd0 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -26,7 +26,7 @@ onboot: - /var:/var:rshared,rbind services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 2f04500e6..f24517017 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -26,7 +26,7 @@ onboot: - /var:/var:rshared,rbind services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 5e0780b07..69761e0e5 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -30,7 +30,7 @@ services: - name: sshd image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true files: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 5d6bdbb70..fb0b6fde6 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd From 5833d1b6bc83959d2a0e2ffa6ab34ac31262dbc9 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 13 Jun 2017 16:27:54 +0100 Subject: [PATCH 2/4] init: replace ctr with a custom client using the containerd client library Currently it supports only `service start `, but it could grow e.g. `stop`, `exec` etc in the future (although you can still use `ctr` for those). In order to be able to use go-compile.sh the containerd build needs to move from /root/go to /go as the GOPATH. The vendoring situation is not ideal, but since this tool wants to be an exact match for the containerd it seems tollerable to reuse its vendoring. Signed-off-by: Ian Campbell --- examples/aws.yml | 4 +- examples/azure.yml | 2 +- examples/docker.yml | 4 +- examples/gcp.yml | 4 +- examples/getty.yml | 2 +- examples/minimal.yml | 4 +- examples/node_exporter.yml | 4 +- examples/packet.yml | 4 +- examples/redis-os.yml | 4 +- examples/sshd.yml | 4 +- examples/swap.yml | 4 +- examples/vmware.yml | 4 +- examples/vpnkit-forwarder.yml | 4 +- examples/vsudd.yml | 4 +- linuxkit.yml | 4 +- pkg/containerd/Dockerfile | 11 +- pkg/containerd/cmd/service/main.go | 75 ++++++++++++ pkg/containerd/cmd/service/skanky-vendor.sh | 14 +++ pkg/containerd/cmd/service/start.go | 113 ++++++++++++++++++ pkg/init/etc/init.d/010-containerd | 5 +- projects/etcd/etcd.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/kubernetes/kube-master.yml | 4 +- projects/kubernetes/kube-node.yml | 4 +- projects/logging/examples/logging.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- test/cases/000_build/000_outputs/test.yml | 4 +- .../000_qemu/000_run_kernel/test.yml | 4 +- .../000_qemu/010_run_iso/test.yml | 4 +- .../000_qemu/020_run_efi/test.yml | 4 +- .../000_qemu/030_run_qcow/test.yml | 4 +- .../000_qemu/040_run_raw/test.yml | 4 +- .../000_qemu/100_container/test.yml | 4 +- .../010_hyperkit/000_run_kernel/test.yml | 4 +- .../000_config_4.4.x/test-kernel-config.yml | 4 +- .../001_config_4.9.x/test-kernel-config.yml | 4 +- .../003_config_4.11.x/test-kernel-config.yml | 4 +- test/cases/020_kernel/010_kmod_4.9.x/kmod.yml | 4 +- .../000_docker-bench/test-docker-bench.yml | 4 +- test/cases/030_security/010_ports/test.yml | 4 +- .../040_packages/002_binfmt/test-binfmt.yml | 4 +- .../test-ca-certificates.yml | 4 +- .../040_packages/004_dhcpcd/test-dhcpcd.yml | 4 +- .../040_packages/013_mkimage/mkimage.yml | 4 +- test/cases/040_packages/013_mkimage/run.yml | 4 +- .../040_packages/019_sysctl/test-sysctl.yml | 4 +- test/hack/test-ltp.yml | 4 +- test/hack/test.yml | 4 +- 50 files changed, 293 insertions(+), 89 deletions(-) create mode 100644 pkg/containerd/cmd/service/main.go create mode 100755 pkg/containerd/cmd/service/skanky-vendor.sh create mode 100644 pkg/containerd/cmd/service/start.go diff --git a/examples/aws.yml b/examples/aws.yml index 9273c2f0a..b77134b6c 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index 131de430c..8da1a180d 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/docker.yml b/examples/docker.yml index 0893e5601..d0a434eb6 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 037b1d547..99f8d3d34 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 7cd6f4fe7..1323e3061 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/minimal.yml b/examples/minimal.yml index ea0db8e2e..b666d3a72 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index bbba98361..c46ea5ada 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 services: - name: getty image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" diff --git a/examples/packet.yml b/examples/packet.yml index 57a54fdc6..7f199bd63 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS1 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 75f15f799..70dceb424 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,9 +4,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/sshd.yml b/examples/sshd.yml index 8eda6e34c..ddd01a706 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index 089ca6fa7..66e3e1f34 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index e1e1440e5..26866f3bc 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index aef0fc929..8f03a3281 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 73689da0f..4cc680ef4 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/linuxkit.yml b/linuxkit.yml index c89aa9fa1..b9fe5e4f4 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index c7a017b27..5005a0938 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 as alpine +FROM linuxkit/alpine:7cf5393e04fe0e26e9fa8f507379cacb64595918 as alpine RUN \ apk add \ btrfs-progs-dev \ @@ -9,7 +9,7 @@ RUN \ linux-headers \ make \ && true -ENV GOPATH=/root/go +ENV GOPATH=/go PATH=$PATH:/go/bin ENV CONTAINERD_COMMIT=bdf9f5f7388e8203e63a74b89800f7f3dd4a7743 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ @@ -18,11 +18,16 @@ WORKDIR $GOPATH/src/github.com/containerd/containerd RUN git checkout $CONTAINERD_COMMIT 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/ + +ADD cmd /go/src/cmd +RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd +RUN go-compile.sh /go/src/cmd/service + WORKDIR / COPY . . FROM scratch ENTRYPOINT [] WORKDIR / -COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /usr/bin/ +COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /go/bin/service /usr/bin/ COPY --from=alpine /etc/containerd/config.toml /etc/containerd/ diff --git a/pkg/containerd/cmd/service/main.go b/pkg/containerd/cmd/service/main.go new file mode 100644 index 000000000..39ccf91f1 --- /dev/null +++ b/pkg/containerd/cmd/service/main.go @@ -0,0 +1,75 @@ +package main + +import ( + "flag" + "fmt" + "os" + "path/filepath" + + log "github.com/Sirupsen/logrus" +) + +var ( + defaultLogFormatter = &log.TextFormatter{} +) + +// infoFormatter overrides the default format for Info() log events to +// provide an easier to read output +type infoFormatter struct { +} + +func (f *infoFormatter) Format(entry *log.Entry) ([]byte, error) { + if entry.Level == log.InfoLevel { + return append([]byte(entry.Message), '\n'), nil + } + return defaultLogFormatter.Format(entry) +} + +func main() { + flag.Usage = func() { + fmt.Printf("USAGE: %s [options] COMMAND\n\n", filepath.Base(os.Args[0])) + fmt.Printf("Commands:\n") + fmt.Printf(" start Start a service\n") + fmt.Printf(" help Print this message\n") + fmt.Printf("\n") + fmt.Printf("Run '%s COMMAND --help' for more information on the command\n", filepath.Base(os.Args[0])) + fmt.Printf("\n") + fmt.Printf("Options:\n") + flag.PrintDefaults() + } + flagQuiet := flag.Bool("q", false, "Quiet execution") + flagVerbose := flag.Bool("v", false, "Verbose execution") + + // Set up logging + log.SetFormatter(new(infoFormatter)) + log.SetLevel(log.InfoLevel) + flag.Parse() + if *flagQuiet && *flagVerbose { + fmt.Printf("Can't set quiet and verbose flag at the same time\n") + os.Exit(1) + } + if *flagQuiet { + log.SetLevel(log.ErrorLevel) + } + if *flagVerbose { + // Switch back to the standard formatter + log.SetFormatter(defaultLogFormatter) + log.SetLevel(log.DebugLevel) + } + + args := flag.Args() + if len(args) < 1 { + fmt.Printf("Please specify a command.\n\n") + flag.Usage() + os.Exit(1) + } + + switch args[0] { + case "start": + start(args[1:]) + default: + fmt.Printf("%q is not valid command.\n\n", args[0]) + flag.Usage() + os.Exit(1) + } +} diff --git a/pkg/containerd/cmd/service/skanky-vendor.sh b/pkg/containerd/cmd/service/skanky-vendor.sh new file mode 100755 index 000000000..483002264 --- /dev/null +++ b/pkg/containerd/cmd/service/skanky-vendor.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# +# We only need the containerd client and its transitive dependencies +# and we conveniently have a checkout already. We actually prefer to +# reuse containerd's vendoring for consistency anyway. + +set -eu +ctrd=$1 +cp -r $ctrd/vendor/ vendor/ +# We need containerd itself of course +mkdir -p vendor/github.com/containerd +cp -r $ctrd vendor/github.com/containerd/containerd +# Stop go finding nested vendorings +rm -rf vendor/github.com/containerd/containerd/vendor diff --git a/pkg/containerd/cmd/service/start.go b/pkg/containerd/cmd/service/start.go new file mode 100644 index 000000000..82004df90 --- /dev/null +++ b/pkg/containerd/cmd/service/start.go @@ -0,0 +1,113 @@ +package main + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "io/ioutil" + "os" + "path/filepath" + + log "github.com/Sirupsen/logrus" + "github.com/containerd/containerd" + "github.com/containerd/containerd/namespaces" + specs "github.com/opencontainers/runtime-spec/specs-go" +) + +func start(args []string) { + invoked := filepath.Base(os.Args[0]) + flags := flag.NewFlagSet("start", flag.ExitOnError) + flags.Usage = func() { + fmt.Printf("USAGE: %s start [service]\n\n", invoked) + fmt.Printf("Options:\n") + flags.PrintDefaults() + } + + sock := flags.String("sock", "/run/containerd/containerd.sock", "Path to containerd socket") + + dumpSpec := flags.String("dump-spec", "", "Dump container spec to file before start") + + if err := flags.Parse(args); err != nil { + log.Fatal("Unable to parse args") + } + args = flags.Args() + + if len(args) != 1 { + fmt.Println("Please specify the service") + flags.Usage() + os.Exit(1) + } + + service := args[0] + rootfs := filepath.Join("/containers/services", service, "rootfs") + log.Infof("Starting service: %q", service) + log := log.WithFields(log.Fields{ + "service": service, + }) + + client, err := containerd.New(*sock) + if err != nil { + log.WithError(err).Fatal("creating containerd client") + } + + ctx := namespaces.WithNamespace(context.Background(), "default") + + var spec *specs.Spec + specf, err := os.Open(filepath.Join("/containers/services", service, "config.json")) + if err != nil { + log.WithError(err).Fatal("failed to read service spec") + } + if err := json.NewDecoder(specf).Decode(&spec); err != nil { + log.WithError(err).Fatal("failed to parse service spec") + } + + log.Debugf("Rootfs is %s", rootfs) + + spec.Root.Path = rootfs + + if *dumpSpec != "" { + d, err := os.Create(*dumpSpec) + if err != nil { + log.WithError(err).Fatal("failed to open file for spec dump") + } + enc := json.NewEncoder(d) + enc.SetIndent("", " ") + if err := enc.Encode(&spec); err != nil { + log.WithError(err).Fatal("failed to write spec dump") + } + + } + + ctr, err := client.NewContainer(ctx, service, containerd.WithSpec(spec)) + if err != nil { + log.WithError(err).Fatal("failed to create container") + } + + io := func() (*containerd.IO, error) { + logfile := filepath.Join("/var/log", service+".log") + // We just need this to exist. + if err := ioutil.WriteFile(logfile, []byte{}, 0666); err != nil { + log.WithError(err).Fatal("failed to touch logfile") + } + return &containerd.IO{ + Stdin: "/dev/null", + Stdout: logfile, + Stderr: logfile, + Terminal: false, + }, nil + } + + task, err := ctr.NewTask(ctx, io) + if err != nil { + // Don't bother to destroy the container here. + log.WithError(err).Fatal("failed to create task") + } + + if err := task.Start(ctx); err != nil { + // Don't destroy the container here so it can be inspected for debugging. + log.WithError(err).Fatal("failed to start task") + } + + log.Debugf("Started %s pid %d", ctr.ID(), task.Pid()) +} diff --git a/pkg/init/etc/init.d/010-containerd b/pkg/init/etc/init.d/010-containerd index afae70c7f..3fdb3c994 100755 --- a/pkg/init/etc/init.d/010-containerd +++ b/pkg/init/etc/init.d/010-containerd @@ -34,12 +34,9 @@ if [ -d /containers/services ] then for f in $(find /containers/services -mindepth 1 -maxdepth 1 | sort) do - base="$(basename $f)" /bin/mount --bind "$f/rootfs" "$f/rootfs" mount -o remount,rw "$f/rootfs" - log="/var/log/$base.log" - ctr run --runtime-config "$f/config.json" --rootfs "$f/rootfs" --id "$(basename $f)" $log >$log & - printf " - $base\n" + service start "$(basename $f)" done fi diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 9fa19bc94..2d5a9665b 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 7bf1db5a8..78b7f354b 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 5286c4dd0..29a195a77 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index f24517017..433c94113 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index a47474bab..1362bb0b3 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 # with runc, logwrite, startmemlogd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 69761e0e5..6e3d103e3 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: sysctl image: linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index fb0b6fde6..25336d1bb 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index e1af5a03b..f354f3363 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 0e27e0381..b0a368e76 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index c8b8c7c25..964d86d61 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 987e9c4c7..7050d53a1 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index c8b8c7c25..964d86d61 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index c8b8c7c25..964d86d61 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index c8b8c7c25..964d86d61 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 68625908a..499ba1fa1 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index c8b8c7c25..964d86d61 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index ae6f21ab8..8beb31bb8 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.4.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index 27e774e8f..8c29050d8 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index ff61d9106..2b3719158 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.11.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml index db2f6ea8b..7b2d2ea47 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 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 3e71d4f6b..b804002e6 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 @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 072d56981..9caaefaa9 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: test image: "alpine:3.6" diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index 10d22670b..3bacf42c1 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: binfmt image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml index 69e615107..4eda60511 100644 --- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml +++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: test diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index 1d6e35792..a7d92c0f3 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index ccbbe4270..5c68b678f 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: mkimage image: "linuxkit/mkimage:f4bf0c24261f7d120c8674892805ab3054eb8ac3" diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 1089b3009..b892e8be4 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index f38ef281d..525994903 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 17bcad5c9..d6208cbee 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: ltp image: "linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d" diff --git a/test/hack/test.yml b/test/hack/test.yml index a993078d5..3d5adf48b 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" From d51784adc0b9af5d8d511f1a2681a906f6dfeec8 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 14 Jun 2017 16:21:08 +0100 Subject: [PATCH 3/4] Allow /etc/init.d/010-containerd to exit when complete Don't think there is a need for it to remain and it drops an unnecessary process. Signed-off-by: Ian Campbell --- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.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 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd.yml | 2 +- linuxkit.yml | 2 +- pkg/init/etc/init.d/010-containerd | 2 -- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- test/cases/000_build/000_outputs/test.yml | 2 +- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml | 2 +- test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/010_kmod_4.9.x/kmod.yml | 2 +- test/cases/030_security/000_docker-bench/test-docker-bench.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test-binfmt.yml | 2 +- .../040_packages/003_ca-certificates/test-ca-certificates.yml | 2 +- test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test-sysctl.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- 40 files changed, 39 insertions(+), 41 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index b77134b6c..3ac140316 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/azure.yml b/examples/azure.yml index 8da1a180d..d0592d491 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/docker.yml b/examples/docker.yml index d0a434eb6..249885995 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/gcp.yml b/examples/gcp.yml index 99f8d3d34..6ca78dbdc 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/getty.yml b/examples/getty.yml index 1323e3061..810d3963a 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/minimal.yml b/examples/minimal.yml index b666d3a72..8995df9f7 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index c46ea5ada..a415eedbd 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 services: diff --git a/examples/packet.yml b/examples/packet.yml index 7f199bd63..33417cb67 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 70dceb424..96782d3b4 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index ddd01a706..54a027b24 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/swap.yml b/examples/swap.yml index 66e3e1f34..f3690e39b 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/vmware.yml b/examples/vmware.yml index 26866f3bc..16043b98b 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 8f03a3281..8f19451bd 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 4cc680ef4..199783c54 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/linuxkit.yml b/linuxkit.yml index b9fe5e4f4..5e2453b78 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/pkg/init/etc/init.d/010-containerd b/pkg/init/etc/init.d/010-containerd index 3fdb3c994..8ec251290 100755 --- a/pkg/init/etc/init.d/010-containerd +++ b/pkg/init/etc/init.d/010-containerd @@ -39,5 +39,3 @@ then service start "$(basename $f)" done fi - -wait diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 29a195a77..ffa64d8df 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 433c94113..121b7e402 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:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index b0a368e76..2609a226f 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 964d86d61..f2cd97370 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 7050d53a1..66901cb21 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 964d86d61..f2cd97370 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index 964d86d61..f2cd97370 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index 964d86d61..f2cd97370 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 499ba1fa1..db6bbc3d2 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index 964d86d61..f2cd97370 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index 8beb31bb8..0fd638238 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.4.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index 8c29050d8..19177bf92 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index 2b3719158..7aa66c238 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.11.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml index 7b2d2ea47..1dce3fd7a 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: 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 b804002e6..dab5d199b 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 @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 9caaefaa9..25b6382ae 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index 3bacf42c1..d270ead2f 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml index 4eda60511..116a45671 100644 --- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml +++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index a7d92c0f3..c3e7b5a15 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 5c68b678f..e4a012877 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index b892e8be4..2beca3c5f 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index 525994903..bd4da4d1f 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index d6208cbee..ea2c5c1c3 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 3d5adf48b..ea67b199a 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: From 9d2da9cabc168f41d4af0679857b4cd2151dfa48 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 14 Jun 2017 16:35:33 +0100 Subject: [PATCH 4/4] Update to containerd c215531a8f63a98a69134e804fea4ee6d354bb90 This includes https://github.com/containerd/containerd/pull/994 and hence requires updating the various instances of `/etc/containerd/config.toml`. Signed-off-by: Ian Campbell --- examples/aws.yml | 2 +- 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 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd.yml | 2 +- linuxkit.yml | 5 +++-- pkg/containerd/Dockerfile | 2 +- pkg/containerd/etc/containerd/config.toml | 3 ++- projects/etcd/etcd.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/logging/examples/logging.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/shiftfs/shiftfs.yml | 5 +++-- projects/swarmd/swarmd.yml | 2 +- test/cases/000_build/000_outputs/test.yml | 2 +- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- .../cases/010_platforms/010_hyperkit/000_run_kernel/test.yml | 2 +- .../cases/020_kernel/000_config_4.4.x/test-kernel-config.yml | 2 +- .../cases/020_kernel/001_config_4.9.x/test-kernel-config.yml | 2 +- .../020_kernel/003_config_4.11.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/010_kmod_4.9.x/kmod.yml | 2 +- .../030_security/000_docker-bench/test-docker-bench.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test-binfmt.yml | 2 +- .../003_ca-certificates/test-ca-certificates.yml | 2 +- test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test-sysctl.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- 45 files changed, 50 insertions(+), 47 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index 3ac140316..5ef810adb 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/docker.yml b/examples/docker.yml index 249885995..70241cce6 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 6ca78dbdc..5d0dce48f 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index 8995df9f7..3284bc4fe 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index a415eedbd..380bff9ea 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 services: - name: getty image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" diff --git a/examples/packet.yml b/examples/packet.yml index 33417cb67..3c828f1da 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 96782d3b4..e231d209f 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/sshd.yml b/examples/sshd.yml index 54a027b24..ad098c435 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index f3690e39b..55425f770 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index 16043b98b..1642ee39d 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 8f19451bd..56443354a 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 199783c54..7eab63c29 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/linuxkit.yml b/linuxkit.yml index 5e2453b78..a2f43ec0a 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -34,7 +34,8 @@ files: contents: | state = "/run/containerd" root = "/var/lib/containerd" - snapshotter = "overlay" + snapshotter = "io.containerd.snapshotter.v1.overlayfs" + differ = "io.containerd.differ.v1.base-diff" subreaper = false [grpc] diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 5005a0938..60947a9a5 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -10,7 +10,7 @@ RUN \ make \ && true ENV GOPATH=/go PATH=$PATH:/go/bin -ENV CONTAINERD_COMMIT=bdf9f5f7388e8203e63a74b89800f7f3dd4a7743 +ENV CONTAINERD_COMMIT=c215531a8f63a98a69134e804fea4ee6d354bb90 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git diff --git a/pkg/containerd/etc/containerd/config.toml b/pkg/containerd/etc/containerd/config.toml index 74e36918b..c5884e193 100644 --- a/pkg/containerd/etc/containerd/config.toml +++ b/pkg/containerd/etc/containerd/config.toml @@ -1,6 +1,7 @@ state = "/run/containerd" root = "/var/lib/containerd" -snapshotter = "overlay" +snapshotter = "io.containerd.snapshotter.v1.overlayfs" +differ = "io.containerd.differ.v1.base-diff" subreaper = false [grpc] diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 2d5a9665b..b1242f01d 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 78b7f354b..9f62e945a 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index ffa64d8df..bba91eeff 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 121b7e402..47675a6c7 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 1362bb0b3..076cdd1ac 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 # with runc, logwrite, startmemlogd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 6e3d103e3..1e6915b51 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: sysctl image: linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 25336d1bb..ae92b6198 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -34,7 +34,8 @@ files: contents: | state = "/run/containerd" root = "/var/lib/containerd" - snapshotter = "overlay" + snapshotter = "io.containerd.snapshotter.v1.overlayfs" + differ = "io.containerd.differ.v1.base-diff" subreaper = false [grpc] diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index f354f3363..5d158de3d 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 2609a226f..162852e0e 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:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index f2cd97370..ba70b8e84 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 66901cb21..afc6a0979 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index f2cd97370..ba70b8e84 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index f2cd97370..ba70b8e84 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index f2cd97370..ba70b8e84 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index db6bbc3d2..890990de4 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index f2cd97370..ba70b8e84 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index 0fd638238..1ae34aa05 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index 19177bf92..109a9198f 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index 7aa66c238..4cff3d755 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml index 1dce3fd7a..31b3dc457 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 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 dab5d199b..676912f4d 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:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 25b6382ae..286edd365 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: test image: "alpine:3.6" diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index d270ead2f..ec89b116f 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: binfmt image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml index 116a45671..b3669f245 100644 --- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml +++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: test diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index c3e7b5a15..d6008c800 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index e4a012877..fd49a20e0 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: mkimage image: "linuxkit/mkimage:f4bf0c24261f7d120c8674892805ab3054eb8ac3" diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 2beca3c5f..4a977f146 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index bd4da4d1f..3125a4248 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index ea2c5c1c3..fe3f69bb3 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: ltp image: "linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d" diff --git a/test/hack/test.yml b/test/hack/test.yml index ea67b199a..200b640e0 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"