Merge pull request #2442 from justincormack/tools-additions

Add some more tools to base image and only clone containerd once

blueprints/docker-for-mac/base.yml

@@ -4,9 +4,9 @@ kernel:
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/vpnkit-expose-port:fa4ab4ac78b83fe392e39b861b4114c3bb02d170 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
 onboot:
   # support metadata for optional config in /var/config
   - name: metadata

examples/aws.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

examples/azure.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

examples/docker.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

examples/gcp.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

examples/getty.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

examples/minimal.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
 onboot:
   - name: dhcpcd
     image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

examples/node_exporter.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
 services:
   - name: getty
     image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec

examples/packet.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS1"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: rngd1

examples/redis-os.yml

@@ -4,9 +4,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
 onboot:
   - name: dhcpcd
     image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

examples/sshd.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

examples/swap.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

examples/tpm.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

examples/vmware.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

examples/vpnkit-forwarder.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
 onboot:
   - name: dhcpcd
     image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

examples/vsudd.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
 onboot:
   - name: dhcpcd
     image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

examples/vultr.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

examples/wireguard.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.43
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

linuxkit.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

pkg/containerd/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 as alpine
+FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da as alpine
 RUN \
   apk add \
   btrfs-progs-dev \
@@ -10,13 +10,8 @@ RUN \
   make \
   tzdata \
   && true
-ENV GOPATH=/go PATH=$PATH:/go/bin
+
-# CONTAINERD_REPO and CONTAINERD_COMMIT are defined in linuxkit/alpine
-RUN mkdir -p $GOPATH/src/github.com/containerd && \
-  cd $GOPATH/src/github.com/containerd && \
-  git clone $CONTAINERD_REPO
 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 /usr/bin/
 

pkg/containerd/Makefile

@@ -1,5 +1,4 @@
 IMAGE=containerd
-NETWORK=1
 DEPS=$(wildcard cmd/service/*.go) etc/containerd/config.toml
 
 include ../package.mk

pkg/init/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:0fd732eb9e99c4db0953ae8de23d95de340ab847 AS build
+FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS build
 RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
 
 ADD usermode-helper.c ./
@@ -10,19 +10,10 @@ ENV GOPATH=/go PATH=$PATH:/go/bin
 COPY cmd /go/src/cmd
 RUN go-compile.sh /go/src/cmd/init
 
-# checkout containerd for vendoring
-ENV GOPATH=/go PATH=$PATH:/go/bin
-# CONTAINERD_REPO and CONTAINERD_COMMIT are defined in linuxkit/alpine
-RUN mkdir -p $GOPATH/src/github.com/containerd && \
-  cd $GOPATH/src/github.com/containerd && \
-  git clone $CONTAINERD_REPO
-WORKDIR $GOPATH/src/github.com/containerd/containerd
-RUN git checkout $CONTAINERD_COMMIT
-
 RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd
 RUN go-compile.sh /go/src/cmd/service
 
-FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 AS mirror
+FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl
 

pkg/init/Makefile

@@ -1,5 +1,4 @@
 IMAGE=init
-NETWORK=1
 DEPS=usermode-helper.c $(wildcard etc/*) $(wildcard etc/init.d/*) $(shell find cmd -type f)
 
 include ../package.mk

projects/compose/compose-dynamic.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

projects/compose/compose-static.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

projects/etcd/etcd.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

projects/ima-namespace/ima-namespace.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148
   cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
   - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29
 onboot:

projects/kubernetes/kube-master.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

projects/kubernetes/kube-node.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

projects/logging/examples/logging.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e # with runc, logwrite, startmemlogd
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
   - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012
 onboot:

projects/memorizer/memorizer.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:059b2bb4b6efa5c58cf53fed4d0ea863521959fc
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
 onboot:
   - name: dhcpcd
     image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

projects/miragesdk/examples/fdd.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.34
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
   - samoht/fdd
 onboot:

projects/miragesdk/examples/mirage-dhcp.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
 onboot:
   - name: sysctl
     image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051

projects/okernel/examples/okernel_simple.yaml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/okernel:latest
   cmdline: "console=ttyS0 console=tty0 page_poison=1"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

projects/shiftfs/shiftfs.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5
   cmdline: "console=ttyS0 console=tty0 page_poison=1"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

projects/swarmd/swarmd.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
   - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
 onboot:
   - name: sysctl

test/cases/000_build/000_outputs/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: dhcpcd

test/cases/010_platforms/000_qemu/000_run_kernel/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/010_run_iso/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/020_run_efi/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/030_run_qcow/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/040_run_raw/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/100_container/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: poweroff

test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: poweroff

test/cases/010_platforms/010_hyperkit/010_acpi/test.yml

@@ -2,9 +2,9 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:fc35653f832f053bfb1ce1ed84d2bb7a277e9c18
+  - linuxkit/containerd:8e4aa6c09e9bceee8300a315c23e0333e187f5fa
 services:
   - name: acpid
     image: linuxkit/acpid:79e5c20de96e1633c9c40935b99dde45aefba37b

test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: check-kernel-config

test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: check-kernel-config

test/cases/020_kernel/010_kmod_4.9.x/kmod.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.44
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: check

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.83
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:09d549199c7615fee56567c70d8263585dfa02f7
+  - linuxkit/init:2122f8b7202b383c1be0a91a02122b0c078ca6ac
   - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns