From 80e3072c55e03c8f8ba55faab39c09041b6b3258 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 16 Nov 2017 17:27:23 +0000 Subject: [PATCH] Update tags for format Update for #2743 Signed-off-by: Justin Cormack --- blueprints/docker-for-mac/base.yml | 2 +- examples/docker.yml | 2 +- examples/swap.yml | 2 +- projects/kubernetes/kube.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- .../040_packages/005_extend/000_ext4/test-create.yml | 2 +- .../040_packages/005_extend/001_btrfs/test-create.yml | 2 +- .../040_packages/005_extend/002_xfs/test-create.yml | 2 +- .../040_packages/006_format_mount/000_auto/test.yml | 2 +- .../006_format_mount/001_by_label/test.yml | 2 +- .../006_format_mount/002_by_name/test.yml.in | 2 +- .../040_packages/006_format_mount/003_btrfs/test.yml | 2 +- .../040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../006_format_mount/005_by_device_force/test.yml | 10 +++++----- .../006_format_mount/010_multiple/test.yml | 4 ++-- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index f8457ac09..84940df34 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -20,7 +20,7 @@ onboot: image: linuxkit/binfmt:742781d22fe851e7a1c589fc8d1cf3bd4e264b22 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a command: ["/usr/bin/mountie", "/var/lib"] diff --git a/examples/docker.yml b/examples/docker.yml index 9de50b6ca..96012e6a7 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -12,7 +12,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:5367b46211882278b84a9e8048855ca5df65beda - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/examples/swap.yml b/examples/swap.yml index e3b6b1d1e..30b66f17c 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a command: ["/usr/bin/mountie", "/var/external"] diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index 934403e55..2281c93a2 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -20,7 +20,7 @@ onboot: - name: metadata image: linuxkit/metadata:026aca5c08c22589a7e319f79449bef2c65f04c5 - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e - name: mounts image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a command: ["/usr/bin/mountie", "/var/lib/"] diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index b8a1a7e71..a812788d0 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a command: ["/usr/bin/mountie", "/var/lib/swarmd"] diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 0d09b7f30..cf0326d72 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -12,7 +12,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:5367b46211882278b84a9e8048855ca5df65beda - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index a4ac632ef..92b13ab1f 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -13,7 +13,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:a9ad57ed738a31ea9380cd73236866c312b35489 - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a command: ["/usr/bin/mountie", "/var/lib"] 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 bfdea48ae..23b85ca9b 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 @@ -6,7 +6,7 @@ init: - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d onboot: - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a command: ["/usr/bin/mountie", "/var/lib/docker"] 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 b9ab2e037..75c464999 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 @@ -9,7 +9,7 @@ onboot: image: linuxkit/modprobe:2d153653d1111877a8f53704ef85063a44182ade command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a 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 529276d32..d0c83b3f8 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 @@ -6,7 +6,7 @@ init: - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d onboot: - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-type", "xfs"] - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a 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 4ec8af5e5..bb7138dd9 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 @@ -6,7 +6,7 @@ init: - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d onboot: - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format"] - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a 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 78083a92c..e21ae15e7 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 @@ -6,7 +6,7 @@ init: - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d onboot: - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-label", "docker"] - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a 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 e89166544..6cb6984a3 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 @@ -6,7 +6,7 @@ init: - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d onboot: - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "@DEVICE@"] - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a 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 1aa04a7f4..b530fe25b 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 @@ -9,7 +9,7 @@ onboot: image: linuxkit/modprobe:2d153653d1111877a8f53704ef85063a44182ade command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a 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 ebef5ed0b..32b9ced4c 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 @@ -6,7 +6,7 @@ init: - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d onboot: - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-type", "xfs" ] - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index 73c2448f6..38424953b 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -6,19 +6,19 @@ init: - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d onboot: - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] 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 dec43da52..20d1b3125 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 @@ -6,10 +6,10 @@ init: - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d onboot: - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 + image: linuxkit/format:6b46d0450082f397177da36be6b4d74d93eacd1e command: ["/usr/bin/format", "-label", "foo"] - name: mount image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a