diff --git a/examples/aws.yml b/examples/aws.yml index d86042941..014fc13bc 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/docker.yml b/examples/docker.yml index 2e7a1384a..a71c4a0c3 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index d86042941..014fc13bc 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index bd43e862a..4bc243012 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 46a5ef16c..1206e5170 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf services: - name: rngd image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" diff --git a/examples/packet.yml b/examples/packet.yml index 390aab39c..3c355ac81 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 93f66b04a..611a63f5e 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/sshd.yml b/examples/sshd.yml index 69a631740..0cdb2abba 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index f8d39b046..ef5ebbf6e 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index 345c7d311..d546bfdb5 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 7524d0ad8..a2272cca8 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/linuxkit.yml b/linuxkit.yml index 665fe3ddb..48ccd97a5 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 9eae1e14e..2675524ed 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS qemu +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS qemu RUN apk add \ qemu-aarch64 \ qemu-arm \ diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile index 3bd8c7dc5..5b99f6253 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 as alpine +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf as alpine RUN apk add ca-certificates diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 19d93331c..c7a017b27 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -10,7 +10,7 @@ RUN \ make \ && true ENV GOPATH=/root/go -ENV CONTAINERD_COMMIT=25cc7614ae1cc2c192f6c9ceca0c1c6fd6b091aa +ENV CONTAINERD_COMMIT=bdf9f5f7388e8203e63a74b89800f7f3dd4a7743 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index fd40b6fbb..d76c234c5 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf 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 \ diff --git a/pkg/docker-ce/Dockerfile b/pkg/docker-ce/Dockerfile index 639156913..46c66330a 100644 --- a/pkg/docker-ce/Dockerfile +++ b/pkg/docker-ce/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies # removed openssl as I do not think server needs it diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 73f1c604f..1603c4881 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 850066d8e..82944153e 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf 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/mkimage/Dockerfile b/pkg/mkimage/Dockerfile index a5fa368d0..0c72dfcbb 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile index b4609b24b..dc48c69ba 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index 18db88aac..700df6241 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf 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 \ diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile index a021587c4..1134da90a 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/qemu-ga/Dockerfile b/pkg/qemu-ga/Dockerfile index 9691b25f4..380349e69 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS build +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS build RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/var/run RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index 07fd49dbd..82166458a 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,11 +1,11 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ tini RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache RUN mkdir -p /out/dev /out/proc /out/sys -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS build +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS build RUN apk add \ argp-standalone \ automake \ diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index b49ecfde2..706d2ddc7 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 as alpine +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index 31c48bc7e..0338ae1aa 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/swap/Dockerfile b/pkg/swap/Dockerfile index 7ad7f0ab0..8b6881cd1 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/sysctl/Dockerfile b/pkg/sysctl/Dockerfile index 828e80ac1..0c6d27845 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile index 3383ef010..b43a0c429 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vsudd/Dockerfile b/pkg/vsudd/Dockerfile index d9f6392e5..3ea74859f 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 063922daf..62ed276f6 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 98536684c..09a711966 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index cf35824e9..d9118081c 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 7129df5af..8009be94e 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index d48dffd6f..596bdf1af 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 # with runc, logwrite, startmemlogd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index e634f50cd..cf83d760d 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index a5ce6e87a..aa2d96760 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/swarmd/swarmd/Dockerfile b/projects/swarmd/swarmd/Dockerfile index 08d060f6a..875acb17f 100644 --- a/projects/swarmd/swarmd/Dockerfile +++ b/projects/swarmd/swarmd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS build +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS build RUN \ apk update && apk upgrade && \ diff --git a/projects/wireguard/tools/Dockerfile b/projects/wireguard/tools/Dockerfile index e2ed1e373..4f200cf68 100644 --- a/projects/wireguard/tools/Dockerfile +++ b/projects/wireguard/tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 as tools +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf as tools RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories RUN \ apk update && \ diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index bd43e862a..4bc243012 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index b853aea93..24f6e7733 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 020b39344..a7a0d1b94 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index b853aea93..24f6e7733 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index b853aea93..24f6e7733 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index b853aea93..24f6e7733 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index c4bf336fc..07065496a 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index b853aea93..24f6e7733 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index 3ac79724e..3ed5b6bd0 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c" diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index db82ac622..efcd91a0a 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c" diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index 8b00564b1..f374b11a3 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c" diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml index 4f38e907b..d199dc36e 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: check image: "kmod-test" diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml index 49e675f8b..67397d1b6 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index 0141ed3b8..ffa149a43 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: binfmt image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml index fe3c150df..b49831c51 100644 --- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml +++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: test diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index 220946421..dce9ac3d1 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 94319f12c..b29f089f9 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: mkimage image: "linuxkit/mkimage:f4bf0c24261f7d120c8674892805ab3054eb8ac3" diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 42dd6d855..32828b6c0 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index 963c77718..c13b0059b 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 4eb79cd63..9a4804a30 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: ltp image: "linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d" diff --git a/test/hack/test.yml b/test/hack/test.yml index 183d14003..2d59bc3f7 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41 + - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile index 25effd1a5..ed2b32e20 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ tini