From 157b9f27aacce6f9f3c5387951b331f3a3ebe07f Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 31 Jul 2017 17:33:58 +0100 Subject: [PATCH] update hashes for mount Signed-off-by: Justin Cormack --- blueprints/docker-for-mac/base.yml | 2 +- examples/docker.yml | 2 +- examples/swap.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/etcd/etcd.yml | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- .../cases/030_security/000_docker-bench/test-docker-bench.yml | 2 +- test/cases/040_packages/003_containerd/test-containerd.yml | 2 +- test/cases/040_packages/008_format_mount/000_auto/test.yml | 2 +- .../cases/040_packages/008_format_mount/001_by_label/test.yml | 2 +- .../040_packages/008_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/008_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/008_format_mount/004_xfs/test.yml | 2 +- .../cases/040_packages/008_format_mount/010_multiple/test.yml | 4 ++-- test/cases/040_packages/009_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/009_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/009_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/009_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/009_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/009_extend/002_xfs/test.yml | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index af0e8d4ba..c65de8296 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -21,7 +21,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib"] # create docker dir on mounted drive if it doesn't exist - name: mkdir-docker diff --git a/examples/docker.yml b/examples/docker.yml index e78b0aaf0..d15d0978f 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -16,7 +16,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty diff --git a/examples/swap.yml b/examples/swap.yml index 32ea79d01..c8e59bb5f 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -15,7 +15,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/external"] - name: swap image: linuxkit/swap:b6d447b55da3c28bdd8a3f4e30fb42c1fa0157bb diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index e966d8826..de5367c26 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -19,7 +19,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index e314182d2..1a40331db 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -19,7 +19,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 8a1e47772..3a7b995c5 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -12,7 +12,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/etcd"] - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index d34553c3e..ed2de3855 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -21,7 +21,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mounts - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/"] - name: var image: library/alpine:3.6 diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 6f72fc564..18c00ee13 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -21,7 +21,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mounts - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/"] - name: var image: library/alpine:3.6 diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index fca8422a2..cfc2e39fa 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -17,7 +17,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/swarmd"] - name: metadata image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c 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 f8f373d2e..17e6e2144 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 @@ -16,7 +16,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd diff --git a/test/cases/040_packages/003_containerd/test-containerd.yml b/test/cases/040_packages/003_containerd/test-containerd.yml index 73e5c18db..faba10a17 100644 --- a/test/cases/040_packages/003_containerd/test-containerd.yml +++ b/test/cases/040_packages/003_containerd/test-containerd.yml @@ -15,7 +15,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var"] - name: test image: linuxkit/test-containerd:325508d66a3a0afebe2fa0fd1a0325ae0c4d4613 diff --git a/test/cases/040_packages/008_format_mount/000_auto/test.yml b/test/cases/040_packages/008_format_mount/000_auto/test.yml index 063d078d2..8b0ef7c72 100644 --- a/test/cases/040_packages/008_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/008_format_mount/000_auto/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/008_format_mount/001_by_label/test.yml b/test/cases/040_packages/008_format_mount/001_by_label/test.yml index c2630a039..f29723b34 100644 --- a/test/cases/040_packages/008_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/008_format_mount/001_by_label/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/008_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/008_format_mount/002_by_name/test.yml.in index c4c6703c4..24c7eb3b1 100644 --- a/test/cases/040_packages/008_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/008_format_mount/002_by_name/test.yml.in @@ -9,7 +9,7 @@ onboot: image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/008_format_mount/003_btrfs/test.yml b/test/cases/040_packages/008_format_mount/003_btrfs/test.yml index 141fcf112..b4383f7cd 100644 --- a/test/cases/040_packages/008_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/008_format_mount/003_btrfs/test.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/008_format_mount/004_xfs/test.yml b/test/cases/040_packages/008_format_mount/004_xfs/test.yml index 4eb8f06dc..82220c16e 100644 --- a/test/cases/040_packages/008_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/008_format_mount/004_xfs/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/008_format_mount/010_multiple/test.yml b/test/cases/040_packages/008_format_mount/010_multiple/test.yml index 3d061201e..9512f3572 100644 --- a/test/cases/040_packages/008_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/008_format_mount/010_multiple/test.yml @@ -12,10 +12,10 @@ onboot: image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/009_extend/000_ext4/test-create.yml b/test/cases/040_packages/009_extend/000_ext4/test-create.yml index 2d8fb3556..ae0d52493 100644 --- a/test/cases/040_packages/009_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/009_extend/000_ext4/test-create.yml @@ -8,7 +8,7 @@ onboot: - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/009_extend/000_ext4/test.yml b/test/cases/040_packages/009_extend/000_ext4/test.yml index 49866f932..be006c121 100644 --- a/test/cases/040_packages/009_extend/000_ext4/test.yml +++ b/test/cases/040_packages/009_extend/000_ext4/test.yml @@ -8,7 +8,7 @@ onboot: - name: extend image: linuxkit/extend:1e81ffe40ad63887d6210228c2a791f28375ee0f - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/009_extend/001_btrfs/test-create.yml b/test/cases/040_packages/009_extend/001_btrfs/test-create.yml index ef90098d1..b9c9858a4 100644 --- a/test/cases/040_packages/009_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/009_extend/001_btrfs/test-create.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/009_extend/001_btrfs/test.yml b/test/cases/040_packages/009_extend/001_btrfs/test.yml index 702e1defc..56802c70a 100644 --- a/test/cases/040_packages/009_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/009_extend/001_btrfs/test.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/extend:1e81ffe40ad63887d6210228c2a791f28375ee0f command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/009_extend/002_xfs/test-create.yml b/test/cases/040_packages/009_extend/002_xfs/test-create.yml index 5fdf941e3..a89a413d5 100644 --- a/test/cases/040_packages/009_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/009_extend/002_xfs/test-create.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/009_extend/002_xfs/test.yml b/test/cases/040_packages/009_extend/002_xfs/test.yml index fb546488f..5f606ce62 100644 --- a/test/cases/040_packages/009_extend/002_xfs/test.yml +++ b/test/cases/040_packages/009_extend/002_xfs/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/extend:1e81ffe40ad63887d6210228c2a791f28375ee0f command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:54990a6a69cb3ead4da8a9c1f0b651e27aea8d3f + image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6