diff --git a/examples/aws.yml b/examples/aws.yml index 529e10b7c..1a25d01b4 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index 339a042c4..453806ccb 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 0763b79c3..c777b6cc0 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index def8c67d2..dae9a7034 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -4,9 +4,9 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:v0.2 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: # support metadata for optional config in /run/config diff --git a/examples/docker.yml b/examples/docker.yml index 43221080d..ac809c1bb 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index fd40ec770..caa35bb40 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 5d70ebe03..444ca53af 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 4707d50cd..718e51b57 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index 2c8b87b12..c8fa4e7ee 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.2 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 34ed48092..f2e5ce691 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 services: - name: getty image: linuxkit/getty:v0.2 diff --git a/examples/openstack.yml b/examples/openstack.yml index 195b4b550..eb32f3763 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/packet.yml b/examples/packet.yml index b4e5e1f0a..4cea369ef 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,9 +3,9 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 - linuxkit/firmware:v0.2 onboot: diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 410c96e17..9f7acb38f 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.2 diff --git a/examples/sshd.yml b/examples/sshd.yml index 36a32b2a5..d6c54977a 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index ca875e284..a2b0de828 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index 33646aed4..ebf43054b 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index 47adbeb83..879eca68e 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 5f36b8808..385281117 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.2 diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 3915d6f94..7bcef8862 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.2 diff --git a/examples/vultr.yml b/examples/vultr.yml index fd40ec770..caa35bb40 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 3eef5ab97..6e426a2ba 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index bff32fad7..e949be751 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 3b6b61e4f..67bc1e0fd 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 as alpine +FROM linuxkit/alpine:4d6cfc5de9c29ad5cb633db9638660ba22d2fea5 as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index aab5d6c2b..d08c67713 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:4d6cfc5de9c29ad5cb633db9638660ba22d2fea5 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s 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:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:4d6cfc5de9c29ad5cb633db9638660ba22d2fea5 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 diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index 344831a95..9cef40242 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -11,7 +11,7 @@ RUN \ make \ && true ENV GOPATH=/go PATH=$PATH:/go/bin -ENV RUNC_COMMIT=7f24b40cc5423969b4554ef04ba0b00e2b4ba010 +ENV RUNC_COMMIT=9f9c96235cc97674e935002fc3d78361b696a69e RUN mkdir -p $GOPATH/src/github.com/opencontainers && \ cd $GOPATH/src/github.com/opencontainers && \ git clone https://github.com/opencontainers/runc.git diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 0ab03192d..b8894d2f6 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-clear-containers:4.9.x cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - linuxkit/init:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index e9b93e872..edf16d14a 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index cea46bc17..079b64273 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 9d819f16c..7e9d86b27 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/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:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index b2f7c4851..583236413 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: mobylinux/kernel-landlock:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 5ee7a68c2..e38e4d3e9 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:v0.2 # with runc, logwrite, startmemlogd - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e # with runc, logwrite, startmemlogd + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 46dc1d1ba..7eb3e0bdb 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.2 diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 890846e4c..0fad69655 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/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:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 6dadefec8..a053fc047 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 onboot: - name: sysctl image: linuxkit/sysctl:v0.2 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index ecddca58b..ccf3fa503 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,9 +2,9 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index a98490be1..30a6e416d 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/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:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index c6929a15c..3daeceb2a 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.2 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 3de07ea6c..6dd590f0e 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d 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 60734153e..1dbbf9ad6 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d 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 e495d50ad..d2f7eff94 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index e495d50ad..d2f7eff94 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index e495d50ad..d2f7eff94 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index e495d50ad..d2f7eff94 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d 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 29b19e08b..454e4ba35 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d 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 e495d50ad..d2f7eff94 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d 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 d9cb179eb..6ad936171 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 services: - name: acpid image: linuxkit/acpid:v0.2 diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index 611e7d31a..dc610eb99 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.113 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:80bb1cd57205e47b5976f7fa4fb036384d012a1d diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index 0b57e4ba6..9789a4664 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:80bb1cd57205e47b5976f7fa4fb036384d012a1d diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index 5da1bb7c1..bc0a19b46 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:80bb1cd57205e47b5976f7fa4fb036384d012a1d diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml index c7a18d51c..a6263370d 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.113 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index fcb2d43b0..82179dc05 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml index 870da6578..411c3b088 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml index 131facea0..c176653e8 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.113 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 trust: org: - linuxkit diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml index 4d5811795..40153f621 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 trust: org: - linuxkit diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml index 1a719abe5..c50bb45c7 100644 --- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml +++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 trust: org: - linuxkit diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index d8558b25f..326febcc4 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 682aec2d3..aabd0d5c2 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 67c6a45e9..d1dca37e8 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: binfmt image: linuxkit/binfmt:v0.2 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 71e49c76e..72257171d 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 - linuxkit/ca-certificates:v0.2 onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 0236fb9c6..5ba754bff 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: dhcpcd @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:v0.2 command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:152ffeb88c134ddf5544810965f5932e37299f2e + image: linuxkit/test-containerd:5eb051de579648ae22d8a38076743d2a0d1411b0 - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d trust: diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index fdd53b35e..ad06f96d2 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.2 diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 5704aef3e..d68224173 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: format image: linuxkit/format:v0.2 diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index dea483b19..e4e4f0f83 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: extend image: linuxkit/extend:v0.2 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index b6eff719f..bb6965e7f 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: modprobe image: linuxkit/modprobe:v0.2 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 95c14f5c7..6adec425a 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: modprobe image: linuxkit/modprobe:v0.2 diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index dd57136ee..0eb8d2b18 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: format image: linuxkit/format:v0.2 diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 69a7bc72f..3cb28e246 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: extend image: linuxkit/extend:v0.2 diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index 689708854..f33b64038 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: format image: linuxkit/format:v0.2 diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 3a9616bfc..ba9989cc6 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: format image: linuxkit/format:v0.2 diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 654197576..6cabe81b1 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: format image: linuxkit/format:v0.2 diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index f627cdc03..dcf05db62 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: modprobe image: linuxkit/modprobe:v0.2 diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index cf71f3c25..ef786e674 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: format image: linuxkit/format:v0.2 diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index e95d3e57f..0815c1ded 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.51 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: format image: linuxkit/format:v0.2 diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 03561c18f..42f6cd128 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: format image: linuxkit/format:v0.2 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 6fc83a86b..222fb4dfd 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.x cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 2b0a5dc98..a65b85e7b 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: mkimage image: linuxkit/mkimage:v0.2 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index b5270b85b..873bd3728 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 5dec1ad1e..0b5d10f5f 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: sysctl image: linuxkit/sysctl:v0.2 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 9c2933f53..eb2830220 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 - linuxkit/ca-certificates:v0.2 onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index e24768568..2fbf7495b 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index e3aac6116..79e327460 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.9.78 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 - - linuxkit/containerd:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 + - linuxkit/containerd:f5c339dfc54645eeb8c635b77f62b05a8b3a4db6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.2 diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 4e53f6b7a..21d2f78b2 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:4d6cfc5de9c29ad5cb633db9638660ba22d2fea5 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 87b7281f8..e775e50c5 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.2 - - linuxkit/runc:v0.2 + - linuxkit/init:e650be6c21ef9ecb33534858fc63fb8bc5028c6e + - linuxkit/runc:52ecfdef1ae051e7fd5ac5f1d0b7dd859adff015 onboot: - name: test-ns image: linuxkit/test-ns: diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index cfb22b281..a1fcbd6f2 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -43,7 +43,7 @@ RUN go get -u github.com/LK4D4/vndr # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # `test/pkg/containerd/Dockerfile` when changing this. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.0.1 +ENV CONTAINERD_COMMIT=v1.0.2-rc.0 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index c2dc9a886..5e6ad943b 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:4da19976a059bc710eeff8d8daa8a2d3a48b851b-arm64 +# linuxkit/alpine:7c82197bb5138e34a0f6a387c0fc52e123e599ab-arm64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 @@ -25,7 +25,7 @@ btrfs-progs-4.13.2-r0 btrfs-progs-dev-4.13.2-r0 btrfs-progs-libs-4.13.2-r0 build-base-0.5-r0 -busybox-1.27.2-r7 +busybox-1.27.2-r8 busybox-initscripts-3.1-r2 bzip2-1.0.6-r6 ca-certificates-20171114-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 4cf06e60f..277a75d03 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7-amd64 +# linuxkit/alpine:4d6cfc5de9c29ad5cb633db9638660ba22d2fea5-amd64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 @@ -25,7 +25,7 @@ btrfs-progs-4.13.2-r0 btrfs-progs-dev-4.13.2-r0 btrfs-progs-libs-4.13.2-r0 build-base-0.5-r0 -busybox-1.27.2-r7 +busybox-1.27.2-r8 busybox-initscripts-3.1-r2 bzip2-1.0.6-r6 ca-certificates-20171114-r0