diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 1bd6b28fc..a03fddc10 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -20,7 +20,7 @@ onboot: image: linuxkit/binfmt:472eeba777d056c5f98fe074aa0f581c67ccc7ff # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib"] diff --git a/examples/docker.yml b/examples/docker.yml index 6070230e5..763e86712 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -12,7 +12,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/examples/swap.yml b/examples/swap.yml index 342a7e101..924a39f21 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/external"] diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 9d717dc7e..e17d97109 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 651926937..f489be190 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 5d11c0115..2d7897677 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/etcd"] diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index a488084a7..94cd37762 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -20,7 +20,7 @@ onboot: - name: metadata image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mounts image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/"] diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 8409d5c9c..d9c125db1 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 6f10c37b9..a8e2a0c98 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:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 d4aa932c0..c96cbb35b 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:154913b72c6f1f33eb408609fca9963628e8c051 - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 945d9923b..49daa513a 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:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a onboot: - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 f350169b6..ab1511293 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 @@ -13,7 +13,7 @@ onboot: - /sys:/sys command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 2e01a6ca8..34b591a63 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:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a onboot: - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-type", "xfs"] - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 00d80e4af..9a9c6672a 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:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a onboot: - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format"] - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 075cf4f97..d24d83d76 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:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a onboot: - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-label", "docker"] - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 c54de90a3..80ef8b75b 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:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a onboot: - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "@DEVICE@"] - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 14c8401d2..3efd2dc51 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 @@ -13,7 +13,7 @@ onboot: - /sys:/sys command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 d7bbdd198..a71ded092 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:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a onboot: - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da 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 40a790fa8..0ab6c6154 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:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a onboot: - name: format - image: linuxkit/format:test + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:test + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:test + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:test + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:test + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 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 dde49a11d..4760431f2 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:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a onboot: - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 + image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 command: ["/usr/bin/format", "-label", "foo"] - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da