From cfbdb93919344e2ee28dea87f036275b07b9b101 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 25 Jul 2017 14:27:58 +0100 Subject: [PATCH 1/6] Allow overriding moby repo for testing Signed-off-by: Justin Cormack --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2541012d5..0a4067d50 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ endif PREFIX?=/usr/local/ +MOBY_REPO=https://github.com/moby/tool.git MOBY_COMMIT=8e720bff08cb9f20488d1ae6f114a5b1e4edf9cd MOBY_VERSION=0.0 bin/moby: tmp_moby_bin.tar | bin @@ -28,7 +29,7 @@ bin/moby: tmp_moby_bin.tar | bin touch $@ tmp_moby_bin.tar: Makefile - docker run --rm --log-driver=none -e http_proxy=$(http_proxy) -e https_proxy=$(https_proxy) $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone https://github.com/moby/tool.git --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(MOBY_COMMIT) -X main.Version=$(MOBY_VERSION)" -o bin/moby > $@ + docker run --rm --log-driver=none -e http_proxy=$(http_proxy) -e https_proxy=$(https_proxy) $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone $(MOBY_REPO) --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(MOBY_COMMIT) -X main.Version=$(MOBY_VERSION)" -o bin/moby > $@ RTF_COMMIT=a5c5885a833d6378fa61fcd66374cc55f0dde503 RTF_CMD=github.com/linuxkit/rtf/cmd From a81d2deb6106af0f466bd2891d036cc2d9c9e064 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 25 Jul 2017 15:12:40 +0100 Subject: [PATCH 2/6] Do not try to change /etc/resolv.conf The filesystem is supposed to be immutable, so do not try to make a symlink; new versions of moby tool should add one anyway. But try to make the directory a symlink points to, assuming that it will be on a writeable filesystem. fix #1920 see also #2288 Signed-off-by: Justin Cormack --- pkg/init/bin/rc.init | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/init/bin/rc.init b/pkg/init/bin/rc.init index 7b5e65df8..883c655a0 100755 --- a/pkg/init/bin/rc.init +++ b/pkg/init/bin/rc.init @@ -98,10 +98,8 @@ ip addr add 127.0.0.1/8 dev lo brd + scope host ip route add 127.0.0.0/8 dev lo scope host ip link set lo up -# for containerising dhcpcd and other containers that need writable etc -mkdir /tmp/etc -mv /etc/resolv.conf /tmp/etc/resolv.conf -ln -snf /tmp/etc/resolv.conf /etc/resolv.conf +# for containerizing dhcpcd and other containers that need writable /etc/resolv.conf +[ -L /etc/resolv.conf ] && mkdir -p $(dirname $(readlink -n /etc/resolv.conf)) # remount rootfs as readonly mount -o remount,ro / From 1e236e9f0c97f27d4347fbfa831f140eeaac4beb Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 25 Jul 2017 15:25:55 +0100 Subject: [PATCH 3/6] Update build labels for new resolv.conf bind mount Signed-off-by: Justin Cormack --- pkg/dhcpcd/Dockerfile | 2 +- pkg/getty/Dockerfile | 2 +- pkg/metadata/Dockerfile | 2 +- pkg/openntpd/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index 02e2f92c9..c7fe0ea44 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -16,4 +16,4 @@ WORKDIR / COPY --from=mirror /out/ / COPY /dhcpcd.conf /usr/ / CMD ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"] -LABEL org.mobyproject.config='{"binds": ["/var:/var", "/tmp/etc:/etc"], "capabilities": ["CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"]}' +LABEL org.mobyproject.config='{"binds": ["/run/resolvconf:/etc"], "capabilities": ["CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"]}' diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index 5a209cc7b..2ce60eb40 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -32,4 +32,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", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/containers:/containers","/var/log:/var/log","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' +LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/etc/resolv.conf:/etc/resolv.conf", "/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/containers:/containers","/var/log:/var/log","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' diff --git a/pkg/metadata/Dockerfile b/pkg/metadata/Dockerfile index 62d3325b8..9285cad9d 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -12,4 +12,4 @@ CMD [] WORKDIR / COPY --from=mirror /go/bin/metadata /usr/bin/metadata CMD ["/usr/bin/metadata"] -LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var", "/tmp/etc/resolv.conf:/etc/resolv.conf"], "capabilities": ["CAP_SYS_ADMIN"]}' +LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var", "/etc/resolv.conf:/etc/resolv.conf"], "capabilities": ["CAP_SYS_ADMIN"]}' diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile index 0763f01e1..edec900ac 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -16,4 +16,4 @@ WORKDIR / COPY --from=mirror /out/ / COPY etc/ /etc/ CMD ["/usr/sbin/ntpd", "-d", "-s"] -LABEL org.mobyproject.config='{"capabilities": ["CAP_SYS_TIME", "CAP_SYS_NICE", "CAP_SYS_CHROOT", "CAP_SETUID", "CAP_SETGID"]}' +LABEL org.mobyproject.config='{"binds": "/etc/resolv.conf:/etc/resolv.conf", "capabilities": ["CAP_SYS_TIME", "CAP_SYS_NICE", "CAP_SYS_CHROOT", "CAP_SETUID", "CAP_SETGID"]}' From 978910e48d5033281a8673ad45e68d8ad0d4315a Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 25 Jul 2017 15:44:06 +0100 Subject: [PATCH 4/6] Update moby hash Signed-off-by: Justin Cormack --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0a4067d50..0babbe3d2 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ endif PREFIX?=/usr/local/ MOBY_REPO=https://github.com/moby/tool.git -MOBY_COMMIT=8e720bff08cb9f20488d1ae6f114a5b1e4edf9cd +MOBY_COMMIT=36217e5145f1e54807490c09cc389f5e3ac99075 MOBY_VERSION=0.0 bin/moby: tmp_moby_bin.tar | bin tar xf $< From 797392a24407a7f841d40e3942836bc45f741d4d Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 25 Jul 2017 16:25:09 +0100 Subject: [PATCH 5/6] fix openntpd label Signed-off-by: Justin Cormack --- pkg/openntpd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile index edec900ac..357c22d54 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -16,4 +16,4 @@ WORKDIR / COPY --from=mirror /out/ / COPY etc/ /etc/ CMD ["/usr/sbin/ntpd", "-d", "-s"] -LABEL org.mobyproject.config='{"binds": "/etc/resolv.conf:/etc/resolv.conf", "capabilities": ["CAP_SYS_TIME", "CAP_SYS_NICE", "CAP_SYS_CHROOT", "CAP_SETUID", "CAP_SETGID"]}' +LABEL org.mobyproject.config='{"binds": ["/etc/resolv.conf:/etc/resolv.conf"], "capabilities": ["CAP_SYS_TIME", "CAP_SYS_NICE", "CAP_SYS_CHROOT", "CAP_SETUID", "CAP_SETGID"]}' From 64ba3eaaca048c993f70e552856bac1829b356ee Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 25 Jul 2017 16:26:38 +0100 Subject: [PATCH 6/6] update hashes for resolv.conf changes Signed-off-by: Justin Cormack --- blueprints/docker-for-mac/base.yml | 10 +++++----- examples/aws.yml | 6 +++--- examples/azure.yml | 4 ++-- examples/docker.yml | 8 ++++---- examples/gcp.yml | 8 ++++---- examples/getty.yml | 6 +++--- examples/minimal.yml | 6 +++--- examples/node_exporter.yml | 6 +++--- examples/packet.yml | 4 ++-- examples/redis-os.yml | 6 +++--- examples/sshd.yml | 6 +++--- examples/swap.yml | 6 +++--- examples/vmware.yml | 6 +++--- examples/vpnkit-forwarder.yml | 4 ++-- examples/vsudd.yml | 4 ++-- examples/vultr.yml | 8 ++++---- linuxkit.yml | 6 +++--- projects/compose/compose-dynamic.yml | 6 +++--- projects/compose/compose-static.yml | 6 +++--- projects/etcd/etcd.yml | 6 +++--- projects/etcd/prom-us-central1-f.yml | 4 ++-- projects/ima-namespace/ima-namespace.yml | 4 ++-- projects/kubernetes/kube-master.yml | 10 +++++----- projects/kubernetes/kube-node.yml | 10 +++++----- projects/logging/examples/logging.yml | 2 +- projects/memorizer/memorizer.yml | 2 +- projects/miragesdk/examples/fdd.yml | 4 ++-- projects/miragesdk/examples/mirage-dhcp.yml | 4 ++-- projects/okernel/examples/okernel_simple.yaml | 4 ++-- projects/shiftfs/shiftfs.yml | 6 +++--- projects/swarmd/swarmd.yml | 10 +++++----- test/cases/000_build/000_outputs/test.yml | 4 ++-- .../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 +- .../cases/010_platforms/000_qemu/030_run_qcow/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw/test.yml | 2 +- .../010_platforms/000_qemu/100_container/test.yml | 2 +- .../010_platforms/010_hyperkit/000_run_kernel/test.yml | 2 +- .../cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- .../020_kernel/000_config_4.4.x/test-kernel-config.yml | 2 +- .../020_kernel/001_config_4.9.x/test-kernel-config.yml | 2 +- .../003_config_4.11.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/010_kmod_4.9.x/kmod.yml | 2 +- .../110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml | 2 +- .../000_4.4.x/011_tcp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml | 2 +- .../000_4.4.x/021_tcp6_veth_reverse/test-netns.yml | 2 +- .../000_4.4.x/030_tcp4_loopback/test-netns.yml | 2 +- .../000_4.4.x/040_tcp6_loopback/test-netns.yml | 2 +- .../110_netns/000_4.4.x/050_udp4_veth/test-netns.yml | 2 +- .../000_4.4.x/051_udp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/000_4.4.x/060_udp6_veth/test-netns.yml | 2 +- .../000_4.4.x/061_udp6_veth_reverse/test-netns.yml | 2 +- .../000_4.4.x/070_udp4_loopback/test-netns.yml | 2 +- .../000_4.4.x/080_udp6_loopback/test-netns.yml | 2 +- .../110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml | 2 +- .../001_4.9.x/011_tcp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml | 2 +- .../001_4.9.x/021_tcp6_veth_reverse/test-netns.yml | 2 +- .../001_4.9.x/030_tcp4_loopback/test-netns.yml | 2 +- .../001_4.9.x/040_tcp6_loopback/test-netns.yml | 2 +- .../110_netns/001_4.9.x/050_udp4_veth/test-netns.yml | 2 +- .../001_4.9.x/051_udp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/001_4.9.x/060_udp6_veth/test-netns.yml | 2 +- .../001_4.9.x/061_udp6_veth_reverse/test-netns.yml | 2 +- .../001_4.9.x/070_udp4_loopback/test-netns.yml | 2 +- .../001_4.9.x/080_udp6_loopback/test-netns.yml | 2 +- .../110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml | 2 +- .../003_4.11.x/011_tcp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml | 2 +- .../003_4.11.x/021_tcp6_veth_reverse/test-netns.yml | 2 +- .../003_4.11.x/030_tcp4_loopback/test-netns.yml | 2 +- .../003_4.11.x/040_tcp6_loopback/test-netns.yml | 2 +- .../110_netns/003_4.11.x/050_udp4_veth/test-netns.yml | 2 +- .../003_4.11.x/051_udp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/003_4.11.x/060_udp6_veth/test-netns.yml | 2 +- .../003_4.11.x/061_udp6_veth_reverse/test-netns.yml | 2 +- .../003_4.11.x/070_udp4_loopback/test-netns.yml | 2 +- .../003_4.11.x/080_udp6_loopback/test-netns.yml | 2 +- .../000_docker-bench/test-docker-bench.yml | 4 ++-- 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 +- .../040_packages/003_containerd/test-containerd.yml | 2 +- test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml | 4 ++-- .../040_packages/007_getty-containerd/test-ctr.yml | 6 +++--- 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 | 4 ++-- 92 files changed, 158 insertions(+), 158 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index d2a8305a3..f15c6ded9 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -4,13 +4,13 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:e2b49a6c56fbf876ea24f0a5ce4ccae5f940d1be # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e onboot: # support metadata for optional config in /var/config - name: metadata - image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 + image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: sysfs @@ -45,7 +45,7 @@ onboot: - /var:/host_var command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events @@ -53,12 +53,12 @@ services: image: linuxkit/acpid:1966310cb75e28ffc668863a6577ee991327f918 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90 + image: linuxkit/openntpd:2874b66c9fa51fa5b4d11c8b50441eb94ee22a5a # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd diff --git a/examples/aws.yml b/examples/aws.yml index 537036b66..67b4b4c0c 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -10,10 +10,10 @@ onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 + image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b diff --git a/examples/azure.yml b/examples/azure.yml index bdb70f3c1..cc593610f 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -13,7 +13,7 @@ services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b - name: sshd image: linuxkit/sshd:5dc5c3c4470c85f6c89f0e26b9d477ae4ff85a3c files: diff --git a/examples/docker.yml b/examples/docker.yml index 4e004a7ba..48e953b01 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -20,15 +20,15 @@ onboot: command: ["/mount.sh", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b - name: ntpd - image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90 + image: linuxkit/openntpd:2874b66c9fa51fa5b4d11c8b50441eb94ee22a5a - name: docker image: docker:17.06.0-ce-dind capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index 75293e7bf..0b5126b48 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -10,13 +10,13 @@ onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 + image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd diff --git a/examples/getty.yml b/examples/getty.yml index cbfef8bad..12a66d44a 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -10,11 +10,11 @@ onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index 7e163b1b1..418ca44b1 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e onboot: - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 374b9e7d1..0a282bfa3 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b - name: node_exporter image: linuxkit/node_exporter:a058fe1c6a4440a9689022a9fd7cffdcfd56d52c trust: diff --git a/examples/packet.yml b/examples/packet.yml index e40ff28b0..680c3f1bd 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -13,7 +13,7 @@ services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b - name: sshd image: linuxkit/sshd:5dc5c3c4470c85f6c89f0e26b9d477ae4ff85a3c files: diff --git a/examples/redis-os.yml b/examples/redis-os.yml index e39a90679..0dcce7aed 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e onboot: - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index f14f71dda..640be6219 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -11,13 +11,13 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b - name: sshd image: linuxkit/sshd:5dc5c3c4470c85f6c89f0e26b9d477ae4ff85a3c files: diff --git a/examples/swap.yml b/examples/swap.yml index cce910c65..ac210923b 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 @@ -24,7 +24,7 @@ onboot: command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd diff --git a/examples/vmware.yml b/examples/vmware.yml index cf86bf244..94e38a46d 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -11,13 +11,13 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b - name: nginx image: nginx:alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index d3e4ee9d0..8a6d47c93 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e onboot: - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.6 diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 0fcff7ec9..d7351be72 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e onboot: - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd diff --git a/examples/vultr.yml b/examples/vultr.yml index 1d296be36..9aadc2360 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -10,13 +10,13 @@ onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 + image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd diff --git a/linuxkit.yml b/linuxkit.yml index 85c7d63b8..24036c9bc 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -12,7 +12,7 @@ onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -20,7 +20,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 33187fe9d..828b8cf5d 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -12,7 +12,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 @@ -25,7 +25,7 @@ services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: ntpd - image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90 + image: linuxkit/openntpd:2874b66c9fa51fa5b4d11c8b50441eb94ee22a5a - name: docker image: docker:17.06.0-ce-dind capabilities: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index df54a11f9..682aaceec 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -12,7 +12,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 @@ -25,7 +25,7 @@ services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: ntpd - image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90 + image: linuxkit/openntpd:2874b66c9fa51fa5b4d11c8b50441eb94ee22a5a - name: docker image: docker:17.06.0-ce-dind capabilities: diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index ae743a824..3fa1a839e 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -15,15 +15,15 @@ onboot: image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 command: ["/mount.sh", "/var/lib/etcd"] - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 + image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: ntpd - image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90 + image: linuxkit/openntpd:2874b66c9fa51fa5b4d11c8b50441eb94ee22a5a - name: node_exporter image: linuxkit/node_exporter:a058fe1c6a4440a9689022a9fd7cffdcfd56d52c - name: etcd diff --git a/projects/etcd/prom-us-central1-f.yml b/projects/etcd/prom-us-central1-f.yml index 409b2c2f3..8633bc0f2 100644 --- a/projects/etcd/prom-us-central1-f.yml +++ b/projects/etcd/prom-us-central1-f.yml @@ -10,10 +10,10 @@ onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 + image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: rngd image: mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 81993f140..f0e881792 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -13,7 +13,7 @@ onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 40b39a50e..01ac9b568 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -14,7 +14,7 @@ onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 - name: metadata - image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 + image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c - name: format image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 - name: mounts @@ -27,15 +27,15 @@ onboot: - /var/lib:/var/lib services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b - name: ntpd - image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90 + image: linuxkit/openntpd:2874b66c9fa51fa5b4d11c8b50441eb94ee22a5a - name: sshd image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b - name: docker diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index a7ac93d2f..ec2c5290b 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -14,7 +14,7 @@ onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 - name: metadata - image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 + image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c - name: format image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 - name: mounts @@ -27,15 +27,15 @@ onboot: - /var/lib:/var/lib services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b - name: ntpd - image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90 + image: linuxkit/openntpd:2874b66c9fa51fa5b4d11c8b50441eb94ee22a5a - name: sshd image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b - name: docker diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 803f91a4c..fc17bd64f 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -13,7 +13,7 @@ onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index cbfdb5ec6..05a46c9a3 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 8e907329f..aa9b9fda4 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -18,7 +18,7 @@ services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b files: - path: etc/init.d/020-fdd-init mode: "0700" diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 875d05695..817adc6b6 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e onboot: @@ -30,7 +30,7 @@ services: - name: sshd image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index c9d64c6bc..8f379d2f9 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,7 +2,7 @@ kernel: image: linuxkit/okernel:latest cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -13,7 +13,7 @@ services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b - name: sshd image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b files: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index fc8826708..1f374dab3 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,7 +2,7 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -12,11 +12,11 @@ onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: rngd diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index e588d04bd..dc4d8abd0 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -12,7 +12,7 @@ onboot: binds: - /etc/sysctl.d/01-swarmd.conf:/etc/sysctl.d/01-swarmd.conf - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 @@ -20,10 +20,10 @@ onboot: image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 command: ["/mount.sh", "/var/lib/swarmd"] - name: metadata - image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 + image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 env: - INSECURE=true - name: qemu-ga @@ -33,7 +33,7 @@ services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: ntpd - image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90 + image: linuxkit/openntpd:2874b66c9fa51fa5b4d11c8b50441eb94ee22a5a - name: weave image: weaveworks/weave:2.0.1@sha256:2d70caac7db33365482cc923d40ff8d3ec1238ae7fe06a00b3dde310d09f226e # Must match swarmd/Dockerfile command: ["/bin/sh", "/home/weave/weaver-wrapper"] diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 67771e474..e8c79d5c2 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: org: 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 cd806fb67..7b9b6ba17 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: poweroff 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 635999496..0dcefe11b 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: poweroff 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 cd806fb67..7b9b6ba17 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: poweroff 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 cd806fb67..7b9b6ba17 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: poweroff 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 cd806fb67..7b9b6ba17 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: poweroff 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 4445df0e6..c63be086b 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: poweroff 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 cd806fb67..7b9b6ba17 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index f2a1e2df7..4a511631a 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e services: 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 10be77a1a..56e3abc33 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.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: check-kernel-config 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 6b7707a66..d10abd6b3 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: check-kernel-config 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 c22f35e44..ffb9ddd84 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.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: check-kernel-config 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 c24f90e06..32c4e3358 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: check diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml index 2b05c9249..f190c8fed 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml index f368b2969..136b6a8fb 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml index 8cc6363d3..15279ef3c 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml index 182c0220c..61fdae28a 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml index a87286ecc..2d34343f8 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml index 66c5089a6..df47a3699 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml index d255a2932..503f450ec 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml index 397b26793..39b955c98 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml index a8c14dbc7..7d481f076 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml index e140cbee3..dfa719868 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml index 6c5ef120f..7161faa6a 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml index 2a291fc5b..673282dd3 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.78 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml index bbd1eefdd..7c6bf981e 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml index b1080373d..62e93ac5f 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml index 48595bb4a..f829c34d2 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml index e59870192..18853e9c0 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml index 043d2eb07..f6b690234 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml index 2498de1f4..2722f3bc2 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml index 74d7ff65a..7659d0694 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml index 4208a37cd..92f4902fe 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml index fb55b61fa..c40008044 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml index 34c14651e..dc453201b 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml index a732cf34b..bced79873 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml index 487c5b072..389c8f745 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml index 1339ffd30..c8f5cb961 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml index fcbd57d66..d883d1286 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml index 04b620e39..6a9a9e7ee 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml index 25bbd292f..8fb114ccd 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml index 35295a135..f95851a03 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml index ac668ccd7..544fe695a 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml index d12eff7e9..7b6a1621a 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml index 70086accc..8272c6099 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml index 6e6bb065b..e74e4474b 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml index 19b68724a..3c58b0d03 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml index 80131fd6b..0ed4597bc 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml index 08b251d86..4ad88c6ef 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.11.12 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test-netns 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 ff0133acd..6e69decf0 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf @@ -22,7 +22,7 @@ services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b - name: docker image: docker:17.06.0-ce-dind capabilities: diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 87c788c66..5ead218cf 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.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index 0a42b1ed4..ad1f62884 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.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: binfmt 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 1e5a8aebd..08f472247 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.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: diff --git a/test/cases/040_packages/003_containerd/test-containerd.yml b/test/cases/040_packages/003_containerd/test-containerd.yml index f51cc5f6c..26a060c35 100644 --- a/test/cases/040_packages/003_containerd/test-containerd.yml +++ b/test/cases/040_packages/003_containerd/test-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index 534ec2716..bfb70cd66 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/007_getty-containerd/test-ctr.yml b/test/cases/040_packages/007_getty-containerd/test-ctr.yml index f404783d8..16ba499f0 100644 --- a/test/cases/040_packages/007_getty-containerd/test-ctr.yml +++ b/test/cases/040_packages/007_getty-containerd/test-ctr.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e + image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index d62639ba3..c39fdf358 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index dcd7da7dc..1b47e83ef 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.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index cff9fb1d3..aa22e45d7 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.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: sysctl diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index d8cef69f9..6c6511e92 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index ca40c3aa9..9cd96ecf2 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,12 +4,12 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e + - linuxkit/init:838b772355a8690143b37de1cdd4ac5db725271f - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e onboot: - name: dhcpcd - image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76