diff --git a/examples/aws.yml b/examples/aws.yml index 2407e9da9..a4e276a9e 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -18,7 +18,7 @@ services: - name: rngd image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: sshd - image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" + image: "linuxkit/sshd:14f9d669ba6b0ba1658dfb2eb7ac08e1b7d9f5a4" binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index d0592d491..22de15926 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: sshd - image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" + image: "linuxkit/sshd:14f9d669ba6b0ba1658dfb2eb7ac08e1b7d9f5a4" files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/docker.yml b/examples/docker.yml index a4fa74426..0d9dd3efb 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -20,7 +20,7 @@ onboot: command: ["/mount.sh", "/var/lib/docker"] services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index 0a44e1ffb..3466398a0 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -16,13 +16,13 @@ onboot: image: "linuxkit/metadata:31a0b0f5557c6123beaa9c33e3400ae3c03447e0" services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: rngd image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: sshd - image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" + image: "linuxkit/sshd:14f9d669ba6b0ba1658dfb2eb7ac08e1b7d9f5a4" binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 810d3963a..20f2bc283 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index 64ec4aba6..63ba69b45 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -4,14 +4,14 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 556f28e83..0761a7ca6 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -4,10 +4,10 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: rngd diff --git a/examples/packet.yml b/examples/packet.yml index e66a954e4..d6bb4e4cf 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -15,7 +15,7 @@ services: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: sshd - image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" + image: "linuxkit/sshd:14f9d669ba6b0ba1658dfb2eb7ac08e1b7d9f5a4" files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index e6e66cfb2..0113e7047 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -6,14 +6,14 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index 5f6faeca2..9c8f0ffb3 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,14 +4,14 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: rngd @@ -19,7 +19,7 @@ services: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: sshd - image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" + image: "linuxkit/sshd:14f9d669ba6b0ba1658dfb2eb7ac08e1b7d9f5a4" files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index 450b044b7..0bf3b7760 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl @@ -24,7 +24,7 @@ onboot: command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: rngd diff --git a/examples/vmware.yml b/examples/vmware.yml index 7844e621a..884dfd8bf 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,14 +4,14 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: rngd diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 40aa8ec1f..807097612 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" @@ -19,7 +19,7 @@ onboot: command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] services: - name: sshd - image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" + image: "linuxkit/sshd:14f9d669ba6b0ba1658dfb2eb7ac08e1b7d9f5a4" - name: vpnkit-forwarder image: "linuxkit/vpnkit-forwarder:883de832c2c3cb72cd9b01e3f7bd788649e0f2c2" binds: diff --git a/examples/vsudd.yml b/examples/vsudd.yml index d66eb2f25..e6b5df54e 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/linuxkit.yml b/linuxkit.yml index 984c946bd..2d7e85463 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: rngd diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index f6a297f7c..9587cbcac 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:24fe1b6bbf1fc95b484741587acb10da6dbc9211 as alpine +FROM linuxkit/alpine:c96f56ef989ccb31fd115d25c1b90f05b992271d as alpine RUN \ apk add \ btrfs-progs-dev \ @@ -8,6 +8,7 @@ RUN \ libc-dev \ linux-headers \ make \ + tzdata \ && true ENV GOPATH=/go PATH=$PATH:/go/bin RUN mkdir -p $GOPATH/src/github.com/containerd && \ @@ -31,3 +32,4 @@ ENTRYPOINT [] WORKDIR / COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /go/bin/service /usr/bin/ COPY --from=alpine /etc/containerd/config.toml /etc/containerd/ +COPY --from=alpine /usr/share/zoneinfo/UTC /etc/localtime diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index defd12c3f..bc679a09c 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -4,6 +4,7 @@ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ busybox \ + ca-certificates \ musl \ tini \ util-linux \ @@ -28,4 +29,4 @@ COPY --from=mirror /out/ / COPY usr/ /usr/ COPY etc/ /etc/ CMD ["/usr/bin/rungetty.sh"] -LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' +LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index 31c48bc7e..ad6889148 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -4,6 +4,7 @@ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ busybox \ + ca-certificates \ musl \ openssh-server \ tini \ @@ -19,4 +20,4 @@ COPY etc/ /etc/ COPY usr/ /usr/ RUN mkdir -p /etc/ssh /root/.ssh && chmod 0700 /root/.ssh CMD ["/sbin/tini", "/usr/bin/ssh.sh"] -LABEL org.mobyproject.config='{"pid": "host", "binds": ["/root/.ssh:/root/.ssh", "/etc/resolv.conf:/etc/resolv.conf"], "capabilities": ["all"]}' +LABEL org.mobyproject.config='{"pid": "host", "binds": ["/root/.ssh:/root/.ssh", "/etc/resolv.conf:/etc/resolv.conf", "/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 7f1f1667d..dd7a0ba8d 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:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index ed1828af9..a71090e90 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:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 402b065ff..38ecf77d1 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -26,7 +26,7 @@ onboot: - /var:/var:rshared,rbind services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: rngd @@ -36,7 +36,7 @@ services: - name: ntpd image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5" - name: sshd - image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" + image: "linuxkit/sshd:14f9d669ba6b0ba1658dfb2eb7ac08e1b7d9f5a4" - name: docker image: "linuxkit/docker-ce:dda71ff9fe5ebbfa794b98c57c32df286b212848" capabilities: diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index e918254df..1833ac916 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -26,7 +26,7 @@ onboot: - /var:/var:rshared,rbind services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: rngd @@ -36,7 +36,7 @@ services: - name: ntpd image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5" - name: sshd - image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" + image: "linuxkit/sshd:14f9d669ba6b0ba1658dfb2eb7ac08e1b7d9f5a4" - name: docker image: "linuxkit/docker-ce:dda71ff9fe5ebbfa794b98c57c32df286b212848" capabilities: diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index b854d05b1..ed1b27a79 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:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 09a25db7d..9662cb7a7 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: sysctl image: linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018 @@ -28,9 +28,9 @@ onboot: - /lib:/lib # for ifconfig services: - name: sshd - image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" + image: "linuxkit/sshd:14f9d669ba6b0ba1658dfb2eb7ac08e1b7d9f5a4" - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 7079014a2..4b3ea721c 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: sshd - image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" + image: "linuxkit/sshd:14f9d669ba6b0ba1658dfb2eb7ac08e1b7d9f5a4" files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 134f55ad6..f99c7e09e 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" + image: "linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27" env: - INSECURE=true - name: rngd diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index ee25c58db..7d32ad31e 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:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index ebcb3c198..e91c2ad50 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 f0843b890..aaa53e8eb 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 14f0f1b2c..cde8652a3 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 f0843b890..aaa53e8eb 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 f0843b890..aaa53e8eb 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 f0843b890..aaa53e8eb 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 09a1afcbc..1d8f4d33c 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 f0843b890..aaa53e8eb 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 d83240a10..cf064b19d 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119" 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 b443876f5..5300e2856 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119" 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 208c6ad11..f4a925876 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119" 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 4a21bdcd3..f6169ca0f 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 a57c37690..26e441dea 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 33f87d724..f8ceef8b6 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: test image: "alpine:3.6" diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index 87ed4b8ae..3b59bff56 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 46a4a7a21..18c2834e1 100644 --- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml +++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test-containerd.yml b/test/cases/040_packages/003_containerd/test-containerd.yml index 46fbc7ccf..9bb0597c9 100644 --- a/test/cases/040_packages/003_containerd/test-containerd.yml +++ b/test/cases/040_packages/003_containerd/test-containerd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index 239457d63..96a433eab 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 bbed48ee2..8db4b063d 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 da78ff808..541940396 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd 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 116056dfc..44e888253 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 7f82a7701..67a9db499 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: ltp image: "linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d" diff --git a/test/hack/test.yml b/test/hack/test.yml index cdde735d2..eac2b19fc 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/containerd:a33cdcf50b8107ffe14c92802c460fe7ada39acd onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/tools/alpine/packages b/tools/alpine/packages index 2cb3769ee..6a62715fa 100644 --- a/tools/alpine/packages +++ b/tools/alpine/packages @@ -54,8 +54,8 @@ open-vm-tools patch qemu-aarch64 qemu-arm -qemu-img qemu-guest-agent +qemu-img qemu-ppc64le qemu-system-arm qemu-system-x86_64 @@ -67,6 +67,7 @@ strace syslinux tar tini +tzdata util-linux util-linux-dev vim diff --git a/tools/alpine/versions b/tools/alpine/versions index 431ac059f..1b241bbc6 100644 --- a/tools/alpine/versions +++ b/tools/alpine/versions @@ -2,7 +2,7 @@ alpine-baselayout-3.0.4-r0 alpine-keys-2.1-r1 alsa-lib-1.1.3-r0 -apk-tools-2.7.1-r1 +apk-tools-2.7.2-r0 argp-standalone-1.3-r2 automake-1.15-r0 bash-4.3.48-r1 @@ -36,7 +36,7 @@ e2fsprogs-extra-1.43.4-r0 e2fsprogs-libs-1.43.4-r0 elfutils-dev-0.168-r1 elfutils-libelf-0.168-r1 -expat-2.2.0-r0 +expat-2.2.0-r1 file-5.30-r0 findmnt-2.28.2-r2 flex-2.6.4-r1 @@ -74,12 +74,12 @@ libattr-2.4.47-r6 libblkid-2.28.2-r2 libburn-1.4.6-r0 libbz2-1.0.6-r5 -libc-dev-0.7.1-r0 -libc-utils-0.7.1-r0 libcap-2.25-r1 libcap-ng-0.7.8-r0 +libc-dev-0.7.1-r0 libcom_err-1.43.4-r0 libcurl-7.54.0-r0 +libc-utils-0.7.1-r0 libdrm-2.4.80-r0 libedit-20170329.3.1-r2 libelf-0.8.13-r2 @@ -110,10 +110,10 @@ libogg-1.3.2-r1 libpciaccess-0.13.4-r1 libpng-1.6.29-r1 libressl-2.5.4-r0 -libressl-dev-2.5.4-r0 libressl2.5-libcrypto-2.5.4-r0 libressl2.5-libssl-2.5.4-r0 libressl2.5-libtls-2.5.4-r0 +libressl-dev-2.5.4-r0 libsasl-2.1.26-r10 libseccomp-2.3.2-r0 libseccomp-dev-2.3.2-r0 @@ -140,9 +140,9 @@ mkinitfs-3.1.0-r0 mpc1-1.0.3-r0 mpfr3-3.1.5-r0 mtools-4.0.18-r1 -musl-1.1.16-r9 -musl-dev-1.1.16-r9 -musl-utils-1.1.16-r9 +musl-1.1.16-r10 +musl-dev-1.1.16-r10 +musl-utils-1.1.16-r10 ncurses-dev-6.0-r7 ncurses-libs-6.0-r7 ncurses-terminfo-6.0-r7 @@ -150,11 +150,11 @@ ncurses-terminfo-base-6.0-r7 nettle-3.3-r0 npth-1.2-r0 oniguruma-6.2.0-r0 -open-vm-tools-10.1.0-r7 openntpd-6.0_p1-r3 openrc-0.24.1-r2 openssh-keygen-7.5_p1-r1 openssh-server-7.5_p1-r1 +open-vm-tools-10.1.0-r7 opus-1.1.4-r0 p11-kit-0.23.2-r1 patch-2.7.5-r1 @@ -185,6 +185,7 @@ strace-4.16-r1 syslinux-6.04_pre1-r1 tar-1.29-r1 tini-0.14.0-r0 +tzdata-2017a-r0 usbredir-0.7-r2 util-linux-2.28.2-r2 util-linux-dev-2.28.2-r2