diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index b825b4d72..70a8c1f3e 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -15,7 +15,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:v0.7 - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 - name: mount image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 8c8a5e4b9..d699498f8 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "/dev/sda"] - name: mount image: linuxkit/mount:v0.7 diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index c7fc17109..5083a9dda 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "/dev/sda"] - name: dm-crypt image: linuxkit/dm-crypt:v0.7 diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 1e77781c1..ec6c1297c 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -20,7 +20,7 @@ onboot: image: linuxkit/binfmt:v0.7 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 - name: mount image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib"] diff --git a/examples/docker.yml b/examples/docker.yml index 7d967e861..ecbd1c65a 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -12,7 +12,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:v0.7 - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 - name: mount image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/examples/swap.yml b/examples/swap.yml index 1641586da..fb5199655 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 - name: mount image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/external"] diff --git a/pkg/format/format.go b/pkg/format/format.go index d6868d2ac..3b3ffb26d 100644 --- a/pkg/format/format.go +++ b/pkg/format/format.go @@ -197,7 +197,7 @@ func format(d, label, fsType string, forced bool) error { case "btrfs": btrfsArgs := []string{"-f"} if label != "" { - btrfsArgs = append(btrfsArgs, []string{"-l", label}...) + btrfsArgs = append(btrfsArgs, []string{"-L", label}...) } mkfsArgs = append(mkfsArgs, btrfsArgs...) case "xfs": diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 5fa153016..b83552865 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 - name: mount image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index c98f3f07a..c0bc82ab5 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 - name: mount image: linuxkit/mount:v0.7 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 a489bf659..1914de9b2 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:v0.7 - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 - name: mount image: linuxkit/mount:v0.7 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 537b47301..c935f59ff 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:v0.7 - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 - name: mount image: linuxkit/mount:v0.7 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 65aab4385..0af1b39cb 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:c1f0db27e71d948f3134b31ce76276f843849b0a onboot: - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 - name: mount image: linuxkit/mount:v0.7 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 5389a8802..51bc0740c 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:v0.7 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount image: linuxkit/mount:v0.7 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 5c03a75de..5bff9f304 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:c1f0db27e71d948f3134b31ce76276f843849b0a onboot: - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-type", "xfs"] - name: mount image: linuxkit/mount:v0.7 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 2161d1b38..3007fd095 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:c1f0db27e71d948f3134b31ce76276f843849b0a onboot: - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format"] - name: mount image: linuxkit/mount:v0.7 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 ef9db1a3d..e092799b9 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:c1f0db27e71d948f3134b31ce76276f843849b0a onboot: - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-label", "docker"] - name: mount image: linuxkit/mount:v0.7 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 6fd4e1335..9431d57cd 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:c1f0db27e71d948f3134b31ce76276f843849b0a onboot: - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "@DEVICE@"] - name: mount image: linuxkit/mount:v0.7 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 896a2c2f2..c28bf2d9b 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:v0.7 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount image: linuxkit/mount:v0.7 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 9c92eff6e..ee71156cf 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:c1f0db27e71d948f3134b31ce76276f843849b0a onboot: - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount image: linuxkit/mount:v0.7 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 2f70d3fe2..624e1102b 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:c1f0db27e71d948f3134b31ce76276f843849b0a onboot: - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 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 845d42cb0..3e56e3580 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:c1f0db27e71d948f3134b31ce76276f843849b0a onboot: - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:v0.7 + image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 command: ["/usr/bin/format", "-label", "foo"] - name: mount image: linuxkit/mount:v0.7