From a7e61c4da7539c755ba8067152f6c25e919cf938 Mon Sep 17 00:00:00 2001 From: Robin Winkelewski Date: Thu, 11 Jan 2018 13:21:54 +0100 Subject: [PATCH] bump yml format Signed-off-by: Robin Winkelewski --- blueprints/docker-for-mac/base.yml | 2 +- examples/cadvisor.yml | 2 +- examples/docker.yml | 2 +- examples/swap.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.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 ++-- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 81381b3ef..f96bb4ad0 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -20,7 +20,7 @@ onboot: image: linuxkit/binfmt:4b1d7a8dab03c09855fb4b6060a42b2294674b47 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib"] diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 94e95355b..2653eb0bb 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -15,7 +15,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:1284b4a7061a5cc426425f0fb00748192505a05f - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/examples/docker.yml b/examples/docker.yml index a92ca4e38..99d156e9d 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -12,7 +12,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:1284b4a7061a5cc426425f0fb00748192505a05f - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/examples/swap.yml b/examples/swap.yml index 8bf04a2b4..f42df953a 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/external"] diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index fcee18f33..928dc4b18 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index b5b785a0e..a9a55e6e7 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 86b21262a..1668cb0d7 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:1284b4a7061a5cc426425f0fb00748192505a05f - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b 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 e91d51f8f..e740a58e4 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:4c1ef93bb5eb1a877318db4b2daa6768ed002e21 - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b 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 cdda6a0b2..9cc0b104f 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:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b 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 11c398f9c..618b34252 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:1a192d168adadec47afa860e3fc874fbc2a823ff command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b 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 1b35309d2..77c49d0b7 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:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-type", "xfs"] - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b 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 6e45cb7ab..a9fc5cb21 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:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format"] - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b 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 2c75166fa..d28fff1c9 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:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-label", "docker"] - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b 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 636c02916..a3c29fb64 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:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "@DEVICE@"] - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b 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 4caa2a9c0..34018718d 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:1a192d168adadec47afa860e3fc874fbc2a823ff command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b 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 79cd1b1cb..d317a12fe 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:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-type", "xfs" ] - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b 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 b3a1f4a2f..a0d46f191 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:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab 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 fb29bfe3a..bbf75e9dc 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:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:e945016ec780a788a71dcddc81497d54d3b14bc7 + image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab command: ["/usr/bin/format", "-label", "foo"] - name: mount image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b