bump alpine; add erofs-utils package (#4161)

* bump alpine to 3.22; include erofs-utils Signed-off-by: Avi Deitcher <avi@deitcher.net> * tools/alpine: Update to latest Signed-off-by: Avi Deitcher <avi@deitcher.net> * tools: Update to the latest linuxkit/alpine Signed-off-by: Avi Deitcher <avi@deitcher.net> * Update use of tools to latest Signed-off-by: Avi Deitcher <avi@deitcher.net> * Update use of test packages to latest Signed-off-by: Avi Deitcher <avi@deitcher.net> * pkgs: Update packages to the latest linuxkit/alpine Signed-off-by: Avi Deitcher <avi@deitcher.net> * Update package tags Signed-off-by: Avi Deitcher <avi@deitcher.net> * fix scaleway error Signed-off-by: Avi Deitcher <avi@deitcher.net> --------- Signed-off-by: Avi Deitcher <avi@deitcher.net>
2025-09-19 10:01:24 +00:00 · 2025-08-27 19:07:26 +03:00
parent 5cd48735d5
commit 506d11f06d
254 changed files with 1864 additions and 1847 deletions
--- a/test/cases/040_packages/006_format_mount/000_auto/test.yml
+++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml
@@ -2,14 +2,14 @@ kernel:
  image: linuxkit/kernel:6.6.71
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b
-  - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
+  - linuxkit/init:e2c6a1afb6750ea766c7386c7f2115f6e28fda4d
+  - linuxkit/runc:c0d2d13905def9c220e1b61e3c4397e172dbfc2c
 onboot:
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format"]
  - name: mount
-    image: linuxkit/mount:cb8caa72248f7082fc2074ce843d53cdc15df04a
+    image: linuxkit/mount:54906e884b21aca02bf5ecae65f3741b89d8c4e6
    command: ["/usr/bin/mountie", "/var/lib/docker"]
  - name: test
    image: alpine:3.13
@@ -18,7 +18,7 @@ onboot:
      - /check.sh:/check.sh
    command: ["sh", "./check.sh"]
  - name: poweroff
-    image: linuxkit/poweroff:91a23d43c403e200102b7512d8de95f89c86565c
+    image: linuxkit/poweroff:533800608f90bf05e2b39c899f2f1cbe7421b8e7
    command: ["/bin/sh", "/poweroff.sh", "10"]
 files:
  - path: check.sh
--- 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
@@ -2,14 +2,14 @@ kernel:
  image: linuxkit/kernel:6.6.71
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b
-  - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
+  - linuxkit/init:e2c6a1afb6750ea766c7386c7f2115f6e28fda4d
+  - linuxkit/runc:c0d2d13905def9c220e1b61e3c4397e172dbfc2c
 onboot:
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "-label", "docker"]
  - name: mount
-    image: linuxkit/mount:cb8caa72248f7082fc2074ce843d53cdc15df04a
+    image: linuxkit/mount:54906e884b21aca02bf5ecae65f3741b89d8c4e6
    command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"]
  - name: test
    image: alpine:3.13
@@ -18,7 +18,7 @@ onboot:
      - /check.sh:/check.sh
    command: ["sh", "./check.sh"]
  - name: poweroff
-    image: linuxkit/poweroff:91a23d43c403e200102b7512d8de95f89c86565c
+    image: linuxkit/poweroff:533800608f90bf05e2b39c899f2f1cbe7421b8e7
    command: ["/bin/sh", "/poweroff.sh", "10"]
 files:
  - path: check.sh
--- 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
@@ -2,14 +2,14 @@ kernel:
  image: linuxkit/kernel:6.6.71
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b
-  - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
+  - linuxkit/init:e2c6a1afb6750ea766c7386c7f2115f6e28fda4d
+  - linuxkit/runc:c0d2d13905def9c220e1b61e3c4397e172dbfc2c
 onboot:
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "@DEVICE@"]
  - name: mount
-    image: linuxkit/mount:cb8caa72248f7082fc2074ce843d53cdc15df04a
+    image: linuxkit/mount:54906e884b21aca02bf5ecae65f3741b89d8c4e6
    command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"]
  - name: test
    image: alpine:3.13
@@ -18,7 +18,7 @@ onboot:
      - /check.sh:/check.sh
    command: ["sh", "./check.sh"]
  - name: poweroff
-    image: linuxkit/poweroff:91a23d43c403e200102b7512d8de95f89c86565c
+    image: linuxkit/poweroff:533800608f90bf05e2b39c899f2f1cbe7421b8e7
    command: ["/bin/sh", "/poweroff.sh", "10"]
 files:
  - path: check.sh
--- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml
+++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml
@@ -2,17 +2,17 @@ kernel:
  image: linuxkit/kernel:6.6.71
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b
-  - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
+  - linuxkit/init:e2c6a1afb6750ea766c7386c7f2115f6e28fda4d
+  - linuxkit/runc:c0d2d13905def9c220e1b61e3c4397e172dbfc2c
 onboot:
  - name: modprobe
-    image: linuxkit/modprobe:773ee174006ecbb412830e48889795bae40b62f9
+    image: linuxkit/modprobe:c2d61d0989a54b0d41b8622304fb0f1f00e173e3
    command: ["modprobe", "btrfs"]
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "-type", "btrfs" ]
  - name: mount
-    image: linuxkit/mount:cb8caa72248f7082fc2074ce843d53cdc15df04a
+    image: linuxkit/mount:54906e884b21aca02bf5ecae65f3741b89d8c4e6
    command: ["/usr/bin/mountie", "/var/lib/docker"]
  - name: test
    image: alpine:3.13
@@ -21,7 +21,7 @@ onboot:
      - /check.sh:/check.sh
    command: ["sh", "./check.sh"]
  - name: poweroff
-    image: linuxkit/poweroff:91a23d43c403e200102b7512d8de95f89c86565c
+    image: linuxkit/poweroff:533800608f90bf05e2b39c899f2f1cbe7421b8e7
    command: ["/bin/sh", "/poweroff.sh", "10"]
 files:
  - path: check.sh
--- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml
+++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml
@@ -2,14 +2,14 @@ kernel:
  image: linuxkit/kernel:6.6.71
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b
-  - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
+  - linuxkit/init:e2c6a1afb6750ea766c7386c7f2115f6e28fda4d
+  - linuxkit/runc:c0d2d13905def9c220e1b61e3c4397e172dbfc2c
 onboot:
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "-type", "xfs" ]
  - name: mount
-    image: linuxkit/mount:cb8caa72248f7082fc2074ce843d53cdc15df04a
+    image: linuxkit/mount:54906e884b21aca02bf5ecae65f3741b89d8c4e6
    command: ["/usr/bin/mountie", "/var/lib/docker"]
  - name: test
    image: alpine:3.21
@@ -18,7 +18,7 @@ onboot:
      - /check.sh:/check.sh
    command: ["sh", "./check.sh"]
  - name: poweroff
-    image: linuxkit/poweroff:91a23d43c403e200102b7512d8de95f89c86565c
+    image: linuxkit/poweroff:533800608f90bf05e2b39c899f2f1cbe7421b8e7
    command: ["/bin/sh", "/poweroff.sh", "10"]
 files:
  - path: check.sh
--- 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
@@ -2,23 +2,23 @@ kernel:
  image: linuxkit/kernel:6.6.71
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b
-  - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
+  - linuxkit/init:e2c6a1afb6750ea766c7386c7f2115f6e28fda4d
+  - linuxkit/runc:c0d2d13905def9c220e1b61e3c4397e172dbfc2c
 onboot:
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"]
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"]
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"]
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"]
  - name: test
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    binds:
      - /check.sh:/check.sh
    command: ["sh", "./check.sh"]
@@ -26,7 +26,7 @@ onboot:
      - CAP_SYS_ADMIN
      - CAP_MKNOD
  - name: poweroff
-    image: linuxkit/poweroff:91a23d43c403e200102b7512d8de95f89c86565c
+    image: linuxkit/poweroff:533800608f90bf05e2b39c899f2f1cbe7421b8e7
    command: ["/bin/sh", "/poweroff.sh", "10"]
 files:
  - path: check.sh
--- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml
+++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml
@@ -2,14 +2,14 @@ kernel:
  image: linuxkit/kernel:6.6.71
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b
-  - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
+  - linuxkit/init:e2c6a1afb6750ea766c7386c7f2115f6e28fda4d
+  - linuxkit/runc:c0d2d13905def9c220e1b61e3c4397e172dbfc2c
 onboot:
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "-partition", "gpt"]
  - name: mount
-    image: linuxkit/mount:cb8caa72248f7082fc2074ce843d53cdc15df04a
+    image: linuxkit/mount:54906e884b21aca02bf5ecae65f3741b89d8c4e6
    command: ["/usr/bin/mountie", "/var/lib/docker"]
  - name: test
    image: alpine:3.13
@@ -18,7 +18,7 @@ onboot:
      - /check.sh:/check.sh
    command: ["sh", "./check.sh"]
  - name: poweroff
-    image: linuxkit/poweroff:91a23d43c403e200102b7512d8de95f89c86565c
+    image: linuxkit/poweroff:533800608f90bf05e2b39c899f2f1cbe7421b8e7
    command: ["/bin/sh", "/poweroff.sh", "10"]
 files:
  - path: check.sh
--- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml
+++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml
@@ -2,20 +2,20 @@ kernel:
  image: linuxkit/kernel:6.6.71
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b
-  - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
+  - linuxkit/init:e2c6a1afb6750ea766c7386c7f2115f6e28fda4d
+  - linuxkit/runc:c0d2d13905def9c220e1b61e3c4397e172dbfc2c
 onboot:
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "-label", "docker"]
  - name: format
-    image: linuxkit/format:3fb088f60ed73ba4a15be41e44654b74112fd3f9
+    image: linuxkit/format:512d4fb6cd40c1d90a4aa8335d1bd167fa34a10e
    command: ["/usr/bin/format", "-label", "foo"]
  - name: mount
-    image: linuxkit/mount:cb8caa72248f7082fc2074ce843d53cdc15df04a
+    image: linuxkit/mount:54906e884b21aca02bf5ecae65f3741b89d8c4e6
    command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"]
  - name: mount
-    image: linuxkit/mount:cb8caa72248f7082fc2074ce843d53cdc15df04a
+    image: linuxkit/mount:54906e884b21aca02bf5ecae65f3741b89d8c4e6
    command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"]
  - name: test
    image: alpine:3.13
@@ -25,7 +25,7 @@ onboot:
      - /check.sh:/check.sh
    command: ["sh", "./check.sh"]
  - name: poweroff
-    image: linuxkit/poweroff:91a23d43c403e200102b7512d8de95f89c86565c
+    image: linuxkit/poweroff:533800608f90bf05e2b39c899f2f1cbe7421b8e7
    command: ["/bin/sh", "/poweroff.sh", "10"]
 files:
  - path: check.sh