diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 16184a8d4..29ebaa375 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -15,7 +15,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:3498aa99c90a29439b5a1926f6ffcd75c270372c - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index b04b0783c..49c277685 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "/dev/sda"] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index 978db7530..7517189bd 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "/dev/sda"] - name: dm-crypt image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index f2d9f03af..7574547c4 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -20,7 +20,7 @@ onboot: image: linuxkit/binfmt:5567917e7de481e4867d31c7490a0ebdb70e04a5 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib"] diff --git a/examples/docker.yml b/examples/docker.yml index 79bdbb3b9..d9be8485b 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -12,7 +12,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:3498aa99c90a29439b5a1926f6ffcd75c270372c - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/examples/swap.yml b/examples/swap.yml index 238201ab1..a094a1019 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/external"] diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index ef2514c03..21f1f8d98 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index caa2e50a6..f62fbee40 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 f8ed97af0..f56a73cbf 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:3498aa99c90a29439b5a1926f6ffcd75c270372c - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 592f1b4f4..be53c09b0 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:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 a3a98b577..764a25898 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:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 310220ee8..9cc7444ec 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:e2045c96cd2d3ef08eaf452396462d9205667690 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 9d06a9b94..b935099c4 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:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-type", "xfs"] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb diff --git a/test/cases/040_packages/005_extend/003_gpt/test-create.yml b/test/cases/040_packages/005_extend/003_gpt/test-create.yml index 3b86c6fbe..947f3305f 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test-create.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test-create.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-partition", "gpt"] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 d0791f39d..63e5a7e89 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:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format"] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 33960a4d5..cd98bfad8 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:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-label", "docker"] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 ab0cb640f..3f455a0ea 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:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "@DEVICE@"] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 75543ecfb..faecc92a8 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:e2045c96cd2d3ef08eaf452396462d9205667690 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 9b873b62b..319001729 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:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-type", "xfs" ] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 609279c3f..02585b300 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:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.yml b/test/cases/040_packages/006_format_mount/006_gpt/test.yml index 37f385d62..973950009 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-partition", "gpt"] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb 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 7ab2af8ab..d69b85ae3 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:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3 + image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "-label", "foo"] - name: mount image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb