diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index f58d164fe..abdb0ddf6 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -22,7 +22,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap diff --git a/examples/docker.yml b/examples/docker.yml index 2650fb1ca..66cfd5de4 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -14,7 +14,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty diff --git a/examples/swap.yml b/examples/swap.yml index 6f14a3437..6d3cac9ca 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -15,7 +15,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/external"] - name: swap image: linuxkit/swap:3881b1e0fadb7765d2fa85d03563c887ab9335a6 diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 68b154fb7..4da643a00 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -17,7 +17,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 7d512c427..e9f9ad171 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -17,7 +17,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 29ad61df9..bab8f77e2 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -12,7 +12,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/etcd"] - name: dhcpcd image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index dc00ce569..91e1928b3 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -22,7 +22,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mounts - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/"] services: - name: getty diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 23936e282..2660265d0 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -17,7 +17,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/swarmd"] - name: metadata image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index eb48b10cf..8d2613441 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -14,7 +14,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 416131fe0..894b08c53 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -15,7 +15,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib"] - name: test image: linuxkit/test-containerd:d6d49adba473c8bd512555fb1bd3c4bd882c830c diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 751251926..1353776a2 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -8,7 +8,7 @@ onboot: - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index ab6791480..d78a1bb2e 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -8,7 +8,7 @@ onboot: - name: extend image: linuxkit/extend:468cc677e35503a265235767d5f488253f51cfd6 - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 038f7f0d3..84974d5d1 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 581efdb96..e4cae087f 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/extend:468cc677e35503a265235767d5f488253f51cfd6 command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 5f6d005fb..752a34396 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 01d9353d0..3e56b5b81 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/extend:468cc677e35503a265235767d5f488253f51cfd6 command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index ef9ddcbf5..63564f4e9 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index daef22116..52a20f4ad 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 35485d275..c54de90a3 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -9,7 +9,7 @@ onboot: image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 392428f96..48107c968 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 91f43e41e..c9b1501c9 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 2413ad589..4a537db3e 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -12,10 +12,10 @@ onboot: image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 + image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.6