From 3d7f70873f0adaf9111546fcb995f81467122c5d Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 6 Aug 2025 23:08:13 -0700 Subject: [PATCH] Update `busybox:glibc` in integration tests to latest (1.37.0) builds This removes `mips64le` (no longer supported by the image / upstream in Debian Trixie+) and adds `riscv64`. Signed-off-by: Tianon Gravi (cherry picked from commit ce5400da08f59001c2906be781dfee2a0f6183ba) Signed-off-by: Ricardo Branco --- tests/integration/bootstrap-get-images.sh | 6 ++-- tests/integration/get-images.sh | 40 +++++++++++------------ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/integration/bootstrap-get-images.sh b/tests/integration/bootstrap-get-images.sh index 78d512cfc..c826d0ab9 100755 --- a/tests/integration/bootstrap-get-images.sh +++ b/tests/integration/bootstrap-get-images.sh @@ -9,8 +9,8 @@ set -Eeuo pipefail # https://github.com/docker-library/bashbrew/releases images=( - # pinned to an older BusyBox (prior to 1.36 becoming "latest") because 1.36.0 has some unresolved bugs, especially around sha256sum - 'https://github.com/docker-library/official-images/raw/eaed422a86b43c885a0f980d48f4bbf346086a4a/library/busybox:glibc' + # https://github.com/docker-library/official-images/commits/HEAD/library/busybox + 'https://github.com/docker-library/official-images/raw/67f09d75e7915359c2216cb12cf6fc1150d42a26/library/busybox:glibc' # pinned to an older Debian Buster which has more architectures than the latest does (Buster transitioned from the Debian Security Team to the LTS Team which supports a smaller set) 'https://github.com/docker-library/official-images/raw/ce10f6b60289c0c0b5de6f785528b8725f225a58/library/debian:buster-slim' @@ -76,7 +76,7 @@ bashbrew cat --format ' {{- $branch := $.TagEntry.ArchGitFetch . | trimPrefixes "refs/heads/" -}} {{- $commit := $.TagEntry.ArchGitCommit . -}} {{- $dir := $.TagEntry.ArchDirectory . -}} - {{- $tarball := eq $.RepoName "debian" | ternary "rootfs.tar.xz" "busybox.tar.xz" -}} + {{- $tarball := eq $.RepoName "debian" | ternary "rootfs.tar.xz" "rootfs.tar.gz" -}} {{ . | replace "arm64v8" "arm64" "arm32" "arm" "i386" "386" }} {{- ")\n" -}} {{- "\t" -}}# {{ $repo }}/tree/{{ $branch }}{{- "\n" -}} diff --git a/tests/integration/get-images.sh b/tests/integration/get-images.sh index 5fc20cf1b..09d2809af 100755 --- a/tests/integration/get-images.sh +++ b/tests/integration/get-images.sh @@ -49,50 +49,50 @@ fi case $arch in amd64) # https://github.com/docker-library/busybox/tree/dist-amd64 - # https://github.com/docker-library/busybox/tree/31d342ad033e27c18723a516a2274ab39547be27/stable/glibc - url="https://github.com/docker-library/busybox/raw/31d342ad033e27c18723a516a2274ab39547be27/stable/glibc/busybox.tar.xz" + # https://github.com/docker-library/busybox/tree/9c2d0c6fbaaf2ca1b4c19027fa515d9e797e7199/latest/glibc/amd64 + url="https://github.com/docker-library/busybox/raw/9c2d0c6fbaaf2ca1b4c19027fa515d9e797e7199/latest/glibc/amd64/rootfs.tar.gz" ;; armv5) # https://github.com/docker-library/busybox/tree/dist-arm32v5 - # https://github.com/docker-library/busybox/tree/96ea82ea25565f78b50bd032d5768d64985d6e11/stable/glibc - url="https://github.com/docker-library/busybox/raw/96ea82ea25565f78b50bd032d5768d64985d6e11/stable/glibc/busybox.tar.xz" + # https://github.com/docker-library/busybox/tree/d687cd5484009bdf2ee3e79a78600f01a7edc912/latest/glibc/arm32v5 + url="https://github.com/docker-library/busybox/raw/d687cd5484009bdf2ee3e79a78600f01a7edc912/latest/glibc/arm32v5/rootfs.tar.gz" ;; armv7) # https://github.com/docker-library/busybox/tree/dist-arm32v7 - # https://github.com/docker-library/busybox/tree/5cb6c347469e86e4468e5e248de751b3598bb577/stable/glibc - url="https://github.com/docker-library/busybox/raw/5cb6c347469e86e4468e5e248de751b3598bb577/stable/glibc/busybox.tar.xz" + # https://github.com/docker-library/busybox/tree/c773a028ec0e18dc92e89e0bc57898883897ef8d/latest/glibc/arm32v7 + url="https://github.com/docker-library/busybox/raw/c773a028ec0e18dc92e89e0bc57898883897ef8d/latest/glibc/arm32v7/rootfs.tar.gz" ;; arm64) # https://github.com/docker-library/busybox/tree/dist-arm64v8 - # https://github.com/docker-library/busybox/tree/94c664b5ca464546266bce54be0082874a44c7b2/stable/glibc - url="https://github.com/docker-library/busybox/raw/94c664b5ca464546266bce54be0082874a44c7b2/stable/glibc/busybox.tar.xz" + # https://github.com/docker-library/busybox/tree/8141f5b047a1fbeefd842388244c045825a61c90/latest/glibc/arm64v8 + url="https://github.com/docker-library/busybox/raw/8141f5b047a1fbeefd842388244c045825a61c90/latest/glibc/arm64v8/rootfs.tar.gz" ;; 386) # https://github.com/docker-library/busybox/tree/dist-i386 - # https://github.com/docker-library/busybox/tree/461a473aef31b7726ea99909a24551bf44565c05/stable/glibc - url="https://github.com/docker-library/busybox/raw/461a473aef31b7726ea99909a24551bf44565c05/stable/glibc/busybox.tar.xz" - ;; - -mips64le) - # https://github.com/docker-library/busybox/tree/dist-mips64le - # https://github.com/docker-library/busybox/tree/47f73f7c735dcd6760a976bfe0012d251b6ef0a9/stable/glibc - url="https://github.com/docker-library/busybox/raw/47f73f7c735dcd6760a976bfe0012d251b6ef0a9/stable/glibc/busybox.tar.xz" + # https://github.com/docker-library/busybox/tree/ddcda848177fffa1df68fbed9cda06bd17757dad/latest/glibc/i386 + url="https://github.com/docker-library/busybox/raw/ddcda848177fffa1df68fbed9cda06bd17757dad/latest/glibc/i386/rootfs.tar.gz" ;; ppc64le) # https://github.com/docker-library/busybox/tree/dist-ppc64le - # https://github.com/docker-library/busybox/tree/9ca13bc214717966383cf97e08606b444b7300e4/stable/glibc - url="https://github.com/docker-library/busybox/raw/9ca13bc214717966383cf97e08606b444b7300e4/stable/glibc/busybox.tar.xz" + # https://github.com/docker-library/busybox/tree/ddb1ced9350261eb7aa6d117052d04a5ad8dd1b7/latest/glibc/ppc64le + url="https://github.com/docker-library/busybox/raw/ddb1ced9350261eb7aa6d117052d04a5ad8dd1b7/latest/glibc/ppc64le/rootfs.tar.gz" + ;; + +riscv64) + # https://github.com/docker-library/busybox/tree/dist-riscv64 + # https://github.com/docker-library/busybox/tree/aa4b2b5fc1583c52a2806f38772d2f684f3c3185/latest/glibc/riscv64 + url="https://github.com/docker-library/busybox/raw/aa4b2b5fc1583c52a2806f38772d2f684f3c3185/latest/glibc/riscv64/rootfs.tar.gz" ;; s390x) # https://github.com/docker-library/busybox/tree/dist-s390x - # https://github.com/docker-library/busybox/tree/a03814d21bcf97767121bb9422a742ec237a09e2/stable/glibc - url="https://github.com/docker-library/busybox/raw/a03814d21bcf97767121bb9422a742ec237a09e2/stable/glibc/busybox.tar.xz" + # https://github.com/docker-library/busybox/tree/52d5ab6b9089780aaa39f36c7d4562ee0f7ce3d5/latest/glibc/s390x + url="https://github.com/docker-library/busybox/raw/52d5ab6b9089780aaa39f36c7d4562ee0f7ce3d5/latest/glibc/s390x/rootfs.tar.gz" ;; *)