From 7434ed10e7f47f7cb30f5a8918e811542c55c59a Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Tue, 25 Jul 2017 16:47:00 +0100 Subject: [PATCH] examples: Update to use new mount and format images Signed-off-by: Dave Tucker --- blueprints/docker-for-mac/base.yml | 6 +++--- examples/docker.yml | 6 +++--- examples/swap.yml | 6 +++--- projects/compose/compose-dynamic.yml | 6 +++--- projects/compose/compose-static.yml | 6 +++--- projects/etcd/etcd.yml | 6 +++--- projects/kubernetes/kube-master.yml | 6 +++--- projects/kubernetes/kube-node.yml | 6 +++--- projects/swarmd/swarmd.yml | 6 +++--- .../030_security/000_docker-bench/test-docker-bench.yml | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index f15c6ded9..2f3e91ff9 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -19,10 +19,10 @@ onboot: image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 + image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 - command: ["/mount.sh", "/var/lib"] + image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + command: ["/usr/bin/mountie", "/var/lib"] # create docker dir on mounted drive if it doesn't exist - name: mkdir-docker image: alpine:3.6 diff --git a/examples/docker.yml b/examples/docker.yml index 48e953b01..9be2f0bf5 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -14,10 +14,10 @@ onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 - name: format - image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 + image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 - command: ["/mount.sh", "/var/lib/docker"] + image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 diff --git a/examples/swap.yml b/examples/swap.yml index ac210923b..4530d672e 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -13,10 +13,10 @@ onboot: image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 + image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 - command: ["/mount.sh", "/var/external"] + image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + command: ["/usr/bin/mountie", "/var/external"] - name: swap image: linuxkit/swap:b6d447b55da3c28bdd8a3f4e30fb42c1fa0157bb # to use unencrypted swap, use: diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 828b8cf5d..0f029607a 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -17,10 +17,10 @@ onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 - name: format - image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 + image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 - command: ["/mount.sh", "/var/lib/docker"] + image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 682aaceec..892d32385 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -17,10 +17,10 @@ onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 - name: format - image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 + image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 - command: ["/mount.sh", "/var/lib/docker"] + image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 3fa1a839e..f57e84844 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -10,10 +10,10 @@ onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: format - image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 + image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 - command: ["/mount.sh", "/var/lib/etcd"] + image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + command: ["/usr/bin/mountie", "/var/lib/etcd"] - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 8d501668b..3dc9b73d6 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -16,10 +16,10 @@ onboot: - name: metadata image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c - name: format - image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 + image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mounts - image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 - command: ["/mount.sh", "/var/lib/"] + image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + command: ["/usr/bin/mountie", "/var/lib/"] - name: var image: library/alpine:3.6 command: ["mkdir", "/var/lib/kubeadm"] diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 0eb8dcf09..cf0f65016 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -16,10 +16,10 @@ onboot: - name: metadata image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c - name: format - image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 + image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mounts - image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 - command: ["/mount.sh", "/var/lib/"] + image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + command: ["/usr/bin/mountie", "/var/lib/"] - name: var image: library/alpine:3.6 command: ["mkdir", "/var/lib/kubeadm"] diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index dc4d8abd0..544279912 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -15,10 +15,10 @@ onboot: image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 + image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 - command: ["/mount.sh", "/var/lib/swarmd"] + image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + command: ["/usr/bin/mountie", "/var/lib/swarmd"] - name: metadata image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: 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 6e69decf0..5d01ab816 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 @@ -14,10 +14,10 @@ onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 - name: format - image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 + image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768 - command: ["/mount.sh", "/var/lib/docker"] + image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b