From d9aada88dcbf15ca8bd6941f9790d05588be55a7 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 30 May 2017 15:05:08 +0100 Subject: [PATCH 1/3] Update for new default namespaces See https://github.com/moby/tool/pull/56 Signed-off-by: Justin Cormack --- pkg/binfmt/Dockerfile | 2 +- pkg/dhcpcd/Dockerfile | 2 +- pkg/format/Dockerfile | 2 +- pkg/metadata/Dockerfile | 2 +- pkg/mount/Dockerfile | 2 +- pkg/node_exporter/Dockerfile | 2 +- pkg/open-vm-tools/Dockerfile | 1 - pkg/openntpd/Dockerfile | 2 +- pkg/rngd/Dockerfile | 2 +- pkg/sshd/Dockerfile | 2 +- pkg/swap/Dockerfile | 2 +- pkg/sysctl/Dockerfile | 2 +- pkg/sysfs/Dockerfile | 1 + test/pkg/poweroff/Dockerfile | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 8d8acae13..9eae1e14e 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -19,4 +19,4 @@ COPY --from=qemu usr/bin/qemu-* usr/bin/ COPY --from=mirror /go/bin/binfmt usr/bin/binfmt COPY etc/binfmt.d/00_linuxkit.conf etc/binfmt.d/00_linuxkit.conf CMD ["/usr/bin/binfmt", "-dir", "/etc/binfmt.d/", "-mount", "/binfmt_misc"] -LABEL org.mobyproject.config='{"binds": ["/proc/sys/fs/binfmt_misc:/binfmt_misc"], "readonly": true}' +LABEL org.mobyproject.config='{"binds": ["/proc/sys/fs/binfmt_misc:/binfmt_misc"], "readonly": true, "net": "new", "ipc": "new"}' diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index 6bf8536af..fd40b6fbb 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -16,4 +16,4 @@ WORKDIR / COPY --from=mirror /out/ / COPY /dhcpcd.conf /usr/ / CMD ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"] -LABEL org.mobyproject.config='{"binds": ["/var:/var", "/tmp/etc:/etc"], "net": "host", "capabilities": ["CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"]}' +LABEL org.mobyproject.config='{"binds": ["/var:/var", "/tmp/etc:/etc"], "capabilities": ["CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"]}' diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 74cf2004a..73f1c604f 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -19,4 +19,4 @@ WORKDIR / COPY --from=mirror /out/ / COPY format.sh / CMD ["/bin/sh", "/format.sh"] -LABEL org.mobyproject.config='{"binds": ["/dev:/dev"], "capabilities": ["CAP_SYS_ADMIN", "CAP_MKNOD"]}' +LABEL org.mobyproject.config='{"binds": ["/dev:/dev"], "capabilities": ["CAP_SYS_ADMIN", "CAP_MKNOD"], "net": "new", "ipc": "new"}' diff --git a/pkg/metadata/Dockerfile b/pkg/metadata/Dockerfile index 719e17681..d3fa8fd1d 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -12,4 +12,4 @@ CMD [] WORKDIR / COPY --from=mirror /go/bin/metadata /usr/bin/metadata CMD ["/usr/bin/metadata"] -LABEL org.mobyproject.config='{"net": "host", "binds": ["/dev:/dev", "/var:/var", "/tmp/etc/resolv.conf:/etc/resolv.conf"], "capabilities": ["CAP_SYS_ADMIN"]}' +LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var", "/tmp/etc/resolv.conf:/etc/resolv.conf"], "capabilities": ["CAP_SYS_ADMIN"]}' diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile index 767f42d63..b4609b24b 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -17,4 +17,4 @@ WORKDIR / COPY --from=mirror /out/ / COPY mount.sh / CMD ["/bin/sh", "/mount.sh"] -LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var:rshared,rbind"], "capabilities": ["CAP_SYS_ADMIN"], "rootfsPropagation": "shared"}' +LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var:rshared,rbind"], "capabilities": ["CAP_SYS_ADMIN"], "rootfsPropagation": "shared", "net": "new", "ipc": "new"}' diff --git a/pkg/node_exporter/Dockerfile b/pkg/node_exporter/Dockerfile index c680e3970..7bf17fdd9 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -4,4 +4,4 @@ ENTRYPOINT ["/bin/node_exporter", "-collector.procfs", "/host/proc", \ "-collector.sysfs", "/host/sys", \ "-collector.filesystem.ignored-mount-points", \ "^/(sys|proc|dev|host|etc)($|/)"] -LABEL org.mobyproject.config='{"net": "host", "pid": "host", "binds": ["/proc:/host/proc", "/sys:/host/sys", "/:/rootfs"], "capabilities": ["all"]}' +LABEL org.mobyproject.config='{"pid": "host", "binds": ["/proc:/host/proc", "/sys:/host/sys", "/:/rootfs"], "capabilities": ["all"]}' diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index 95a2ea10f..18db88aac 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -14,4 +14,3 @@ CMD [] WORKDIR / COPY --from=mirror /out/ / CMD ["/usr/bin/vmtoolsd"] -LABEL org.mobyproject.config='{"net": "host"}' diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile index 318cdf938..a021587c4 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -16,4 +16,4 @@ WORKDIR / COPY --from=mirror /out/ / COPY etc/ /etc/ CMD ["/usr/sbin/ntpd", "-d", "-s"] -LABEL org.mobyproject.config='{"net": "host", "capabilities": ["CAP_SYS_TIME", "CAP_SYS_NICE", "CAP_SYS_CHROOT", "CAP_SETUID", "CAP_SETGID"]}' +LABEL org.mobyproject.config='{"capabilities": ["CAP_SYS_TIME", "CAP_SYS_NICE", "CAP_SYS_CHROOT", "CAP_SETUID", "CAP_SETGID"]}' diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index 44efcf3ad..07fd49dbd 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -42,4 +42,4 @@ WORKDIR / COPY --from=mirror /out/ / COPY --from=build usr/sbin/rngd usr/sbin/rngd CMD ["/sbin/tini", "/usr/sbin/rngd", "-f"] -LABEL org.mobyproject.config='{"capabilities": ["CAP_SYS_ADMIN"], "oomScoreAdj": -800, "readonly": true}' +LABEL org.mobyproject.config='{"capabilities": ["CAP_SYS_ADMIN"], "oomScoreAdj": -800, "readonly": true, "net": "new", "ipc": "new"}' diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index fd5457637..31c48bc7e 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -19,4 +19,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='{"net": "host", "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"], "capabilities": ["all"]}' diff --git a/pkg/swap/Dockerfile b/pkg/swap/Dockerfile index 9ee7d5fda..7ad7f0ab0 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -16,4 +16,4 @@ WORKDIR / COPY --from=mirror /out/ / COPY /swap.sh . ENTRYPOINT ["swap.sh"] -LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var"], "capabilities": ["CAP_SYS_ADMIN", "CAP_MKNOD"]}' +LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var"], "capabilities": ["CAP_SYS_ADMIN", "CAP_MKNOD"], "net": "new", "ipc": "new"}' diff --git a/pkg/sysctl/Dockerfile b/pkg/sysctl/Dockerfile index d2b4d7dfe..828e80ac1 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -13,4 +13,4 @@ WORKDIR / COPY --from=mirror /go/bin/sysctl /usr/bin/sysctl COPY etc/ /etc/ CMD ["/usr/bin/sysctl"] -LABEL org.mobyproject.config='{"net": "host","pid": "host", "ipc": "host", "readonly": true, "capabilities": ["CAP_SYS_ADMIN"]}' +LABEL org.mobyproject.config='{"pid": "host", "readonly": true, "capabilities": ["CAP_SYS_ADMIN"]}' diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile index a76186f12..3383ef010 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -13,3 +13,4 @@ WORKDIR / COPY --from=mirror /go/bin/sysfs /usr/bin/sysfs COPY etc/ /etc/ CMD ["/usr/bin/sysfs"] +LABEL org.mobyproject.config='{"net": "new", "ipc": "new"}' diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile index 81bd752f7..597989a64 100644 --- a/test/pkg/poweroff/Dockerfile +++ b/test/pkg/poweroff/Dockerfile @@ -1,4 +1,4 @@ FROM alpine:3.5 ADD . ./ ENTRYPOINT ["/bin/sh", "/poweroff.sh"] -LABEL org.mobyproject.config='{"net": "host","pid": "host", "ipc": "host", "readonly": true, "capabilities": ["CAP_SYS_BOOT"]}' +LABEL org.mobyproject.config='{"pid": "host", "readonly": true, "capabilities": ["CAP_SYS_BOOT"]}' From d92e19f02079350aef5107c0fbd86bcbf4cd72dd Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 30 May 2017 15:40:51 +0100 Subject: [PATCH 2/3] Update the yaml files with new builds Signed-off-by: Justin Cormack --- docs/external-disk.md | 4 ++-- examples/docker.yml | 16 ++++++++-------- examples/gcp.yml | 10 +++++----- examples/minimal.yml | 2 +- examples/node_exporter.yml | 6 +++--- examples/packet.yml | 8 ++++---- examples/redis-os.yml | 2 +- examples/sshd.yml | 8 ++++---- examples/swap.yml | 12 ++++++------ examples/vmware.yml | 6 +++--- linuxkit.yml | 8 ++++---- pkg/swap/README.md | 2 +- projects/etcd/etcd.yml | 16 ++++++++-------- projects/etcd/prom-us-central1-f.yml | 6 +++--- projects/ima-namespace/ima-namespace.yml | 8 ++++---- projects/kubernetes/kube-master.yml | 16 ++++++++-------- projects/kubernetes/kube-node.yml | 16 ++++++++-------- projects/kubernetes/mounts.rb | 2 +- projects/logging/examples/logging.yml | 8 ++++---- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/okernel/examples/okernel_simple.yaml | 8 ++++---- projects/swarmd/swarmd.yml | 14 +++++++------- test/cases/000_build/000_outputs/test.yml | 2 +- .../000_docker-bench/test-docker-bench.yml | 14 +++++++------- .../040_packages/002_binfmt/test-binfmt.yml | 2 +- .../040_packages/004_dhcpcd/test-dhcpcd.yml | 2 +- .../040_packages/019_sysctl/test-sysctl.yml | 2 +- test/hack/test.yml | 2 +- 28 files changed, 102 insertions(+), 102 deletions(-) diff --git a/docs/external-disk.md b/docs/external-disk.md index 60acbbf80..265e340a7 100644 --- a/docs/external-disk.md +++ b/docs/external-disk.md @@ -39,9 +39,9 @@ To simplify the process, two `onboot` images are available for you to use: ```yml onboot: - name: format - image: "linuxkit/format:55afe08816c2a4d8dbae3ee51ef53e0bee422d66" + image: "linuxkit/format:180cb2dc1de5e60373385080f8148abf10a3afac" - name: mount - image: "linuxkit/mount:15e20f27abe69d276f796e4026531833ec5ff345" + image: "linuxkit/mount:ff5338822f20375b8913f5a80f9ed4f6ea9a592b" command: ["/mount.sh", "/var/external"] ``` diff --git a/examples/docker.yml b/examples/docker.yml index 0821e98bb..cb871456a 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -8,23 +8,23 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: sysfs - image: linuxkit/sysfs:47367d0ef851e8bf2a9e2f80a05392c17f5c2c88 + image: linuxkit/sysfs:1244c5a86dfa2318c4e304af68d37e12367e1b7f - name: binfmt - image: "linuxkit/binfmt:3433ade10a9271d4035f9424e8669358e425b6f6" + image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" - name: format - image: "linuxkit/format:55afe08816c2a4d8dbae3ee51ef53e0bee422d66" + image: "linuxkit/format:180cb2dc1de5e60373385080f8148abf10a3afac" - name: mount - image: "linuxkit/mount:15e20f27abe69d276f796e4026531833ec5ff345" + image: "linuxkit/mount:ff5338822f20375b8913f5a80f9ed4f6ea9a592b" command: ["/mount.sh", "/var/lib/docker"] services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: ntpd - image: "linuxkit/openntpd:ad834449a7eaf10dc022b3d8d2ed9faf7ec99d37" + image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5" - name: docker image: "linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59" capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index ef344d32c..6f0ef3b94 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -8,17 +8,17 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: "linuxkit/metadata:b053fd6a945829bb626bb3546cad69aae0ff7803" + image: "linuxkit/metadata:4e73345cdcb4f7e9df07b0ee7aede652960297f2" services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: sshd - image: "linuxkit/sshd:ddce15b9fbde068941e31294acdcd22befa4fc20" + image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - /tmp/etc/resolv.conf:/etc/resolv.conf - name: nginx diff --git a/examples/minimal.yml b/examples/minimal.yml index c05614e98..40160d126 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b onboot: - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: org: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index ee1145b59..22c3a02ee 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,11 +7,11 @@ init: - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: node_exporter - image: "linuxkit/node_exporter:29a85e9c5de1a1bd470a963878194303f6a7bd8c" + image: "linuxkit/node_exporter:265b35e1c9bd659fff22b0345fc7c8735c787b3c" trust: org: - linuxkit diff --git a/examples/packet.yml b/examples/packet.yml index 50eedb111..cb4a69e6a 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -8,14 +8,14 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: sshd - image: "linuxkit/sshd:ddce15b9fbde068941e31294acdcd22befa4fc20" + image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" files: - path: root/.ssh/authorized_keys contents: '#your ssh key here' diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 027f737ce..12a874805 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -9,7 +9,7 @@ init: - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b onboot: - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index 279718f0f..94bb5c235 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -8,14 +8,14 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: sshd - image: "linuxkit/sshd:ddce15b9fbde068941e31294acdcd22befa4fc20" + image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" files: - path: root/.ssh/authorized_keys contents: '#your ssh key here' diff --git a/examples/swap.yml b/examples/swap.yml index eb6b03945..e092823f0 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -8,23 +8,23 @@ init: - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: "linuxkit/format:55afe08816c2a4d8dbae3ee51ef53e0bee422d66" + image: "linuxkit/format:180cb2dc1de5e60373385080f8148abf10a3afac" - name: mount - image: "linuxkit/mount:15e20f27abe69d276f796e4026531833ec5ff345" + image: "linuxkit/mount:ff5338822f20375b8913f5a80f9ed4f6ea9a592b" command: ["/mount.sh", "/var/external"] - name: swap - image: "linuxkit/swap:085f0088dd1ef2f994e707e438218ea4d41bad13" + image: "linuxkit/swap:e36b5e794256c2a56c000035f73a4d46f7ffb3e6" # to use unencrypted swap, use: # command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G"] command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: nginx image: "nginx:alpine" capabilities: diff --git a/examples/vmware.yml b/examples/vmware.yml index 03c3abb9a..a27e2ed45 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -8,12 +8,12 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: nginx image: "nginx:alpine" capabilities: diff --git a/linuxkit.yml b/linuxkit.yml index 579b60939..30dbe9a0f 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -8,15 +8,15 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: binfmt - image: "linuxkit/binfmt:3433ade10a9271d4035f9424e8669358e425b6f6" + image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: nginx image: "nginx:alpine" capabilities: diff --git a/pkg/swap/README.md b/pkg/swap/README.md index a2df721cc..61f1f6054 100644 --- a/pkg/swap/README.md +++ b/pkg/swap/README.md @@ -8,7 +8,7 @@ Normally, unless you are running explicitly in a desktop version, LinuxKit image ``` onboot: - name: swap - image: "linuxkit/swap:085f0088dd1ef2f994e707e438218ea4d41bad13" + image: "linuxkit/swap:e36b5e794256c2a56c000035f73a4d46f7ffb3e6" command: ["swap.sh","--path","/var/external/swap","--size","2G"] ``` diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 68b46b854..7e2bf8669 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -8,24 +8,24 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: format - image: "linuxkit/format:55afe08816c2a4d8dbae3ee51ef53e0bee422d66" + image: "linuxkit/format:180cb2dc1de5e60373385080f8148abf10a3afac" - name: mount - image: "linuxkit/mount:15e20f27abe69d276f796e4026531833ec5ff345" + image: "linuxkit/mount:ff5338822f20375b8913f5a80f9ed4f6ea9a592b" command: ["/mount.sh", "/var/lib/etcd"] - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: "linuxkit/metadata:b053fd6a945829bb626bb3546cad69aae0ff7803" + image: "linuxkit/metadata:4e73345cdcb4f7e9df07b0ee7aede652960297f2" services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: ntpd - image: "linuxkit/openntpd:ad834449a7eaf10dc022b3d8d2ed9faf7ec99d37" + image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5" - name: node_exporter - image: "linuxkit/node_exporter:29a85e9c5de1a1bd470a963878194303f6a7bd8c" + image: "linuxkit/node_exporter:265b35e1c9bd659fff22b0345fc7c8735c787b3c" - name: etcd image: "moby/etcd" capabilities: diff --git a/projects/etcd/prom-us-central1-f.yml b/projects/etcd/prom-us-central1-f.yml index 13110ce2a..f00bf6974 100644 --- a/projects/etcd/prom-us-central1-f.yml +++ b/projects/etcd/prom-us-central1-f.yml @@ -8,12 +8,12 @@ init: - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: "linuxkit/metadata:b053fd6a945829bb626bb3546cad69aae0ff7803" + image: "linuxkit/metadata:4e73345cdcb4f7e9df07b0ee7aede652960297f2" services: - name: rngd image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9" diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 2599100a1..0f8044107 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -9,15 +9,15 @@ init: - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: binfmt - image: "linuxkit/binfmt:3433ade10a9271d4035f9424e8669358e425b6f6" + image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: nginx image: "nginx:alpine" capabilities: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 1b093722f..7181cbc4c 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -8,13 +8,13 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: sysfs - image: linuxkit/sysfs:47367d0ef851e8bf2a9e2f80a05392c17f5c2c88 + image: linuxkit/sysfs:1244c5a86dfa2318c4e304af68d37e12367e1b7f - name: binfmt - image: "linuxkit/binfmt:3433ade10a9271d4035f9424e8669358e425b6f6" + image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" - name: format - image: "linuxkit/format:55afe08816c2a4d8dbae3ee51ef53e0bee422d66" + image: "linuxkit/format:180cb2dc1de5e60373385080f8148abf10a3afac" - name: mounts image: "linuxkit/kubernetes:latest-mounts" capabilities: @@ -26,13 +26,13 @@ onboot: - /var:/var:rshared,rbind services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: ntpd - image: "linuxkit/openntpd:ad834449a7eaf10dc022b3d8d2ed9faf7ec99d37" + image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5" - name: sshd - image: "linuxkit/sshd:ddce15b9fbde068941e31294acdcd22befa4fc20" + image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" - name: docker image: "linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59" capabilities: diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 5eb321c15..ef3fb8d71 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -8,13 +8,13 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: sysfs - image: linuxkit/sysfs:47367d0ef851e8bf2a9e2f80a05392c17f5c2c88 + image: linuxkit/sysfs:1244c5a86dfa2318c4e304af68d37e12367e1b7f - name: binfmt - image: "linuxkit/binfmt:3433ade10a9271d4035f9424e8669358e425b6f6" + image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" - name: format - image: "linuxkit/format:55afe08816c2a4d8dbae3ee51ef53e0bee422d66" + image: "linuxkit/format:180cb2dc1de5e60373385080f8148abf10a3afac" - name: mounts image: "linuxkit/kubernetes:latest-mounts" capabilities: @@ -26,13 +26,13 @@ onboot: - /var:/var:rshared,rbind services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: ntpd - image: "linuxkit/openntpd:ad834449a7eaf10dc022b3d8d2ed9faf7ec99d37" + image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5" - name: sshd - image: "linuxkit/sshd:ddce15b9fbde068941e31294acdcd22befa4fc20" + image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" - name: docker image: "linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59" capabilities: diff --git a/projects/kubernetes/mounts.rb b/projects/kubernetes/mounts.rb index 406d825f8..bff3e2513 100644 --- a/projects/kubernetes/mounts.rb +++ b/projects/kubernetes/mounts.rb @@ -1,6 +1,6 @@ import 'common.rb' -from "linuxkit/mount:15e20f27abe69d276f796e4026531833ec5ff345" +from "linuxkit/mount:ff5338822f20375b8913f5a80f9ed4f6ea9a592b" script = [ mount_bind_hostns_self("/etc/cni"), mount_make_hostns_rshared("/etc/cni"), diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 9b339fe49..b57bd3d03 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -9,15 +9,15 @@ init: - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: binfmt - image: "linuxkit/binfmt:3433ade10a9271d4035f9424e8669358e425b6f6" + image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: nginx image: "nginx:alpine" capabilities: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 0fbc45012..5b267fde0 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -8,7 +8,7 @@ init: - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: rngd image: mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index fdcfe9d76..425e8ba6f 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -8,14 +8,14 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: sshd - image: "linuxkit/sshd:ddce15b9fbde068941e31294acdcd22befa4fc20" + image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" files: - path: root/.ssh/authorized_keys contents: '#your ssh key here' diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 9c698c264..9c06d1492 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -8,22 +8,22 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: "linuxkit/format:55afe08816c2a4d8dbae3ee51ef53e0bee422d66" + image: "linuxkit/format:180cb2dc1de5e60373385080f8148abf10a3afac" - name: mount - image: "linuxkit/mount:15e20f27abe69d276f796e4026531833ec5ff345" + image: "linuxkit/mount:ff5338822f20375b8913f5a80f9ed4f6ea9a592b" command: ["/mount.sh", "/var/lib/swarmd"] - name: metadata - image: "linuxkit/metadata:b053fd6a945829bb626bb3546cad69aae0ff7803" + image: "linuxkit/metadata:4e73345cdcb4f7e9df07b0ee7aede652960297f2" services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: ntpd - image: "linuxkit/openntpd:ad834449a7eaf10dc022b3d8d2ed9faf7ec99d37" + image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5" - name: swarmd image: "linuxkit/swarmd:a2f57f14f07fb6d7cded7832b2dabe878b28554e" command: ["/usr/bin/swarmd", "--containerd-addr=/run/containerd/containerd.sock", "--log-level=debug", "--state-dir=/var/lib/swarmd"] diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index c05614e98..40160d126 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b onboot: - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: org: 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 35693bd15..6a5173cf4 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 @@ -8,21 +8,21 @@ init: - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: sysfs - image: "linuxkit/sysfs:47367d0ef851e8bf2a9e2f80a05392c17f5c2c88" + image: "linuxkit/sysfs:1244c5a86dfa2318c4e304af68d37e12367e1b7f" - name: binfmt - image: "linuxkit/binfmt:3433ade10a9271d4035f9424e8669358e425b6f6" + image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" - name: format - image: "linuxkit/format:55afe08816c2a4d8dbae3ee51ef53e0bee422d66" + image: "linuxkit/format:180cb2dc1de5e60373385080f8148abf10a3afac" - name: mount - image: "linuxkit/mount:15e20f27abe69d276f796e4026531833ec5ff345" + image: "linuxkit/mount:ff5338822f20375b8913f5a80f9ed4f6ea9a592b" command: ["/mount.sh", "/var/lib/docker"] services: - name: rngd - image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14" + image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" - name: docker image: "linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59" capabilities: diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index 9bc371c4f..7ce937b15 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b onboot: - name: binfmt - image: "linuxkit/binfmt:3433ade10a9271d4035f9424e8669358e425b6f6" + image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" - name: test image: "alpine:3.6" readonly: true diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index cb1a91c7b..794f2b62a 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b onboot: - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: "alpine:3.6" diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index 34c5d696d..9210c7728 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b onboot: - name: sysctl - image: "linuxkit/sysctl:b16a483897dd5f71be7e0c04cd090b05f52682e1" + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: test image: "alpine:3.6" net: host diff --git a/test/hack/test.yml b/test/hack/test.yml index 4b755edc7..e37cc0144 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -9,7 +9,7 @@ init: - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b onboot: - name: dhcpcd - image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" + image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c" From d614ea37d18afaeddc35f9b3ded1ca5db3b42325 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 30 May 2017 15:41:30 +0100 Subject: [PATCH 3/3] Update Moby Signed-off-by: Justin Cormack --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3702e925a..327320263 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ endif PREFIX?=/usr/local/ -MOBY_COMMIT=101fa30ef335b2fa70ef4fc322821a12bd368c26 +MOBY_COMMIT=5cd1e4e2ae09409940c7c6b36fa3f46f362fc1ab bin/moby: Makefile | bin docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone https://github.com/moby/tool.git --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o $@ > tmp_moby_bin.tar tar xf tmp_moby_bin.tar > $@