docker-library
/
busybox
mirror of https://github.com/docker-library/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #226 from infosiftr/trixie 

Update to Debian Trixie
This commit is contained in:
yosifkit 2025-08-11 16:43:31 -07:00 committed by GitHub
parent e73a53925b fea97c00ab
commit 246d420a4e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
30 changed files with 40 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/ci.yml vendored
View File

@ -35,7 +35,6 @@ jobs:
run: | run: |
strategy="$(GENERATE_STACKBREW_LIBRARY='.github/workflows/fake-gsl.sh' "$BASHBREW_SCRIPTS/github-actions/generate.sh")" strategy="$(GENERATE_STACKBREW_LIBRARY='.github/workflows/fake-gsl.sh' "$BASHBREW_SCRIPTS/github-actions/generate.sh")"
strategy="$(.github/workflows/munge-build.sh -c <<<"$strategy")" strategy="$(.github/workflows/munge-build.sh -c <<<"$strategy")"
strategy="$(.github/workflows/munge-unstable.sh -c <<<"$strategy")"
EOF="EOF-$RANDOM-$RANDOM-$RANDOM" EOF="EOF-$RANDOM-$RANDOM-$RANDOM"
echo "strategy<<$EOF" >> "$GITHUB_OUTPUT" echo "strategy<<$EOF" >> "$GITHUB_OUTPUT"
@ -65,10 +64,4 @@ jobs:
- name: '"docker images"' - name: '"docker images"'
run: ${{ matrix.runs.images }} run: ${{ matrix.runs.images }}
- name: Git Diff # see "munge-build.sh" - name: Git Diff # see "munge-build.sh"
run: | run: git diff --exit-code
if git diff --exit-code */*/Dockerfile.builder; then # see "hack-unstable.sh" (and "munge-unstable.sh")
git diff --exit-code
else
# for unstable builds, let's leave this in but purely informational (instead of causing CI to fail)
git diff
fi

19
.github/workflows/munge-unstable.sh vendored
View File

@ -1,19 +0,0 @@
#!/usr/bin/env bash
set -Eeuo pipefail
# see also "hack-unstable.sh"
jq '
.matrix.include += [
.matrix.include[]
| select(.name | test(" [(].+[)]") | not) # ignore any existing munged builds
| select(.os | startswith("windows-") | not)
| select(.meta.froms | any(startswith("debian:")))
| .name += " (unstable)"
| .runs.prepare += ([
"./hack-unstable.sh " + (.meta.entries[].directory | @sh),
"if git diff --exit-code; then exit 1; fi", # trust, but verify (if hack-unstable did not modify anything, we want to bail quickly)
empty
] | map("\n" + .) | add)
| .runs.pull = "" # pulling images does not make sense here (we just changed them)
]
' "$@"

12
Dockerfile-builder.template
View File

@ -17,11 +17,10 @@ RUN set -eux; \
tar \ tar \
; ;
{{ ) else ( -}} {{ ) else ( -}}
FROM debian:bookworm-slim FROM debian:trixie-slim
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apt-get install --update -y \
apt-get install -y \
bzip2 \ bzip2 \
curl \ curl \
gcc \ gcc \
@ -29,15 +28,14 @@ RUN set -eux; \
make \ make \
patch \ patch \
; \ ; \
rm -rf /var/lib/apt/lists/* apt-get dist-clean
{{ ) end -}} {{ ) end -}}
{{ if env.variant == "uclibc" then ( -}} {{ if env.variant == "uclibc" then ( -}}
# grab/use buildroot for its uClibc toolchain # grab/use buildroot for its uClibc toolchain
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apt-get install --update -y \
apt-get install -y \
bc \ bc \
cpio \ cpio \
dpkg-dev \ dpkg-dev \
@ -49,7 +47,7 @@ RUN set -eux; \
unzip \ unzip \
wget \ wget \
; \ ; \
rm -rf /var/lib/apt/lists/* apt-get dist-clean
# pub dsa1024 2009-01-15 [SC] # pub dsa1024 2009-01-15 [SC]
# AB07 D806 D2CE 741F B886 EE50 B025 BA8B 59C3 6319 # AB07 D806 D2CE 741F B886 EE50 B025 BA8B 59C3 6319

13
hack-unstable.sh
View File

@ -1,13 +0,0 @@
#!/usr/bin/env bash
set -Eeuo pipefail
if [ "$#" -eq 0 ]; then
set -- */*/
fi
set -x
# This is used to modify "Dockerfile.builder" for architectures that are not (yet) supported by stable releases (notably, riscv64).
sed -ri \
-e 's/^(FROM debian:)[^ -]+/\1unstable/g' \
"${@/%//Dockerfile.builder}"

7
latest-1/glibc/Dockerfile.builder generated
View File

@ -4,11 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:bookworm-slim FROM debian:trixie-slim
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apt-get install --update -y \
apt-get install -y \
bzip2 \ bzip2 \
curl \ curl \
gcc \ gcc \
@ -16,7 +15,7 @@ RUN set -eux; \
make \ make \
patch \ patch \
; \ ; \
rm -rf /var/lib/apt/lists/* apt-get dist-clean
# pub 1024D/ACC9965B 2006-12-12 # pub 1024D/ACC9965B 2006-12-12
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B # Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B

0
latest-1/glibc/amd64/blobs/sha256/ae1d923cbe21706d4f9677ce8b05bad652be748ce7695a9137438a1e13bb0066 → latest-1/glibc/amd64/blobs/sha256/1827167fde90df99d9341a27fbce2b445550eb2b18105e03f98102f00c0ec35e
View File

0
latest-1/glibc/amd64/blobs/sha256/8cac9c34e220de273cc3f255b4472cdb639d59fe848f51df8d7d5ddd3dbd378e → latest-1/glibc/amd64/blobs/sha256/4a35a7836fe08f340a42e25c4ac5eef4439585bbbb817b7bd28b2cd87c742642
View File

0
latest-1/glibc/amd64/blobs/sha256/c464210ed74876e1229e7a337e6274297f4eb55b120635f73e2844408ae3ef13 → latest-1/glibc/amd64/blobs/sha256/a9739a817d63534f3c8ceef491b880e3b562e746a6645feb0dc8b3333a4973eb
View File

4
latest-1/glibc/amd64/image-config.json
View File

@ -11,13 +11,13 @@
"history": [ "history": [
{ {
"created": "2023-05-18T22:34:17Z", "created": "2023-05-18T22:34:17Z",
"created_by": "BusyBox 1.36.1 (glibc), Debian 12" "created_by": "BusyBox 1.36.1 (glibc), Debian 13"
} }
], ],
"rootfs": { "rootfs": {
"type": "layers", "type": "layers",
"diff_ids": [ "diff_ids": [
"sha256:2cdfc67c0816c2b7015081259eb6ac437b90828ef2a862e689b13afc14a2a4ab" "sha256:b4cb8796a924c1fe5cf7031b67a551c63f9236c5cb0e0d51af962285ae361db7"
] ]
}, },
"architecture": "amd64", "architecture": "amd64",

6
latest-1/glibc/amd64/image-manifest.json
View File

@ -3,14 +3,14 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": { "config": {
"mediaType": "application/vnd.oci.image.config.v1+json", "mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:ae1d923cbe21706d4f9677ce8b05bad652be748ce7695a9137438a1e13bb0066", "digest": "sha256:1827167fde90df99d9341a27fbce2b445550eb2b18105e03f98102f00c0ec35e",
"size": 459 "size": 459
}, },
"layers": [ "layers": [
{ {
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip", "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"digest": "sha256:c464210ed74876e1229e7a337e6274297f4eb55b120635f73e2844408ae3ef13", "digest": "sha256:a9739a817d63534f3c8ceef491b880e3b562e746a6645feb0dc8b3333a4973eb",
"size": 2141232 "size": 2209397
} }
], ],
"annotations": { "annotations": {

2
latest-1/glibc/amd64/index.json
View File

@ -4,7 +4,7 @@
"manifests": [ "manifests": [
{ {
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:8cac9c34e220de273cc3f255b4472cdb639d59fe848f51df8d7d5ddd3dbd378e", "digest": "sha256:4a35a7836fe08f340a42e25c4ac5eef4439585bbbb817b7bd28b2cd87c742642",
"size": 610, "size": 610,
"platform": { "platform": {
"architecture": "amd64", "architecture": "amd64",

12
latest-1/uclibc/Dockerfile.builder generated
View File

@ -4,11 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:bookworm-slim FROM debian:trixie-slim
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apt-get install --update -y \
apt-get install -y \
bzip2 \ bzip2 \
curl \ curl \
gcc \ gcc \
@ -16,13 +15,12 @@ RUN set -eux; \
make \ make \
patch \ patch \
; \ ; \
rm -rf /var/lib/apt/lists/* apt-get dist-clean
# grab/use buildroot for its uClibc toolchain # grab/use buildroot for its uClibc toolchain
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apt-get install --update -y \
apt-get install -y \
bc \ bc \
cpio \ cpio \
dpkg-dev \ dpkg-dev \
@ -34,7 +32,7 @@ RUN set -eux; \
unzip \ unzip \
wget \ wget \
; \ ; \
rm -rf /var/lib/apt/lists/* apt-get dist-clean
# pub dsa1024 2009-01-15 [SC] # pub dsa1024 2009-01-15 [SC]
# AB07 D806 D2CE 741F B886 EE50 B025 BA8B 59C3 6319 # AB07 D806 D2CE 741F B886 EE50 B025 BA8B 59C3 6319

0
latest-1/uclibc/amd64/blobs/sha256/3db602a468789d708e82e375f2a3f120f539e454b082bc56c1a8e79dd2512a53 → latest-1/uclibc/amd64/blobs/sha256/4fb74a405d9e8feaeec494a6ba5bc0ed277fd5963cc0bde943b8bb0ec9c4fab5
View File

0
latest-1/uclibc/amd64/blobs/sha256/23bc5e7f8d62948c998cc645f5ff3525ad2f1dd0aa685d0a27e46c861c5213f9 → latest-1/uclibc/amd64/blobs/sha256/f32f881fc2df7e7167e394b3e180d61bce7aa3aa53743660bb27a0d45846e279
View File

2
latest-1/uclibc/amd64/image-config.json
View File

@ -11,7 +11,7 @@
"history": [ "history": [
{ {
"created": "2023-05-18T22:34:17Z", "created": "2023-05-18T22:34:17Z",
"created_by": "BusyBox 1.36.1 (uclibc), Buildroot 2025.05, Debian 12" "created_by": "BusyBox 1.36.1 (uclibc), Buildroot 2025.05, Debian 13"
} }
], ],
"rootfs": { "rootfs": {

2
latest-1/uclibc/amd64/image-manifest.json
View File

@ -3,7 +3,7 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": { "config": {
"mediaType": "application/vnd.oci.image.config.v1+json", "mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:3db602a468789d708e82e375f2a3f120f539e454b082bc56c1a8e79dd2512a53", "digest": "sha256:4fb74a405d9e8feaeec494a6ba5bc0ed277fd5963cc0bde943b8bb0ec9c4fab5",
"size": 479 "size": 479
}, },
"layers": [ "layers": [

2
latest-1/uclibc/amd64/index.json
View File

@ -4,7 +4,7 @@
"manifests": [ "manifests": [
{ {
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:23bc5e7f8d62948c998cc645f5ff3525ad2f1dd0aa685d0a27e46c861c5213f9", "digest": "sha256:f32f881fc2df7e7167e394b3e180d61bce7aa3aa53743660bb27a0d45846e279",
"size": 610, "size": 610,
"platform": { "platform": {
"architecture": "amd64", "architecture": "amd64",

7
latest/glibc/Dockerfile.builder generated
View File

@ -4,11 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:bookworm-slim FROM debian:trixie-slim
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apt-get install --update -y \
apt-get install -y \
bzip2 \ bzip2 \
curl \ curl \
gcc \ gcc \
@ -16,7 +15,7 @@ RUN set -eux; \
make \ make \
patch \ patch \
; \ ; \
rm -rf /var/lib/apt/lists/* apt-get dist-clean
# pub 1024D/ACC9965B 2006-12-12 # pub 1024D/ACC9965B 2006-12-12
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B # Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B

0
latest/glibc/amd64/blobs/sha256/6d3e4188a38af91b0c1577b9e88c53368926b2fe0e1fb985d6e8a70040520c4d → latest/glibc/amd64/blobs/sha256/0ed463b26daee791b094dc3fff25edb3e79f153d37d274e5c2936923c38dac2b
View File

0
latest/glibc/amd64/blobs/sha256/7c0ffe5751238c8479f952f3fbc3b719d47bccac0e9bf0a21c77a27cba9ef12d → latest/glibc/amd64/blobs/sha256/182014572d8981d8323fe9944876f63b39694e16ce08ae6296e97686c52b150c
View File

0
latest/glibc/amd64/blobs/sha256/90b9666d4aed1893ff122f238948dfd5e8efdcf6c444fe92371ea0f01750bf8c → latest/glibc/amd64/blobs/sha256/80bfbb8a41a2b27d93763e96f5bdccb8ca289387946e406e6f24053f6a8e8494
View File

4
latest/glibc/amd64/image-config.json
View File

@ -11,13 +11,13 @@
"history": [ "history": [
{ {
"created": "2024-09-26T21:31:42Z", "created": "2024-09-26T21:31:42Z",
"created_by": "BusyBox 1.37.0 (glibc), Debian 12" "created_by": "BusyBox 1.37.0 (glibc), Debian 13"
} }
], ],
"rootfs": { "rootfs": {
"type": "layers", "type": "layers",
"diff_ids": [ "diff_ids": [
"sha256:65014c70e84b6817fac42bb201ec5c1ea460a8da246cac0e481f5c9a9491eac0" "sha256:80e840de630d08a6a1e0ee30e7c8378cf1ed6a424315d7e437f54780aee6bf5a"
] ]
}, },
"architecture": "amd64", "architecture": "amd64",

6
latest/glibc/amd64/image-manifest.json
View File

@ -3,14 +3,14 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": { "config": {
"mediaType": "application/vnd.oci.image.config.v1+json", "mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:6d3e4188a38af91b0c1577b9e88c53368926b2fe0e1fb985d6e8a70040520c4d", "digest": "sha256:0ed463b26daee791b094dc3fff25edb3e79f153d37d274e5c2936923c38dac2b",
"size": 459 "size": 459
}, },
"layers": [ "layers": [
{ {
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip", "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"digest": "sha256:90b9666d4aed1893ff122f238948dfd5e8efdcf6c444fe92371ea0f01750bf8c", "digest": "sha256:80bfbb8a41a2b27d93763e96f5bdccb8ca289387946e406e6f24053f6a8e8494",
"size": 2145249 "size": 2213082
} }
], ],
"annotations": { "annotations": {

2
latest/glibc/amd64/index.json
View File

@ -4,7 +4,7 @@
"manifests": [ "manifests": [
{ {
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:7c0ffe5751238c8479f952f3fbc3b719d47bccac0e9bf0a21c77a27cba9ef12d", "digest": "sha256:182014572d8981d8323fe9944876f63b39694e16ce08ae6296e97686c52b150c",
"size": 610, "size": 610,
"platform": { "platform": {
"architecture": "amd64", "architecture": "amd64",

12
latest/uclibc/Dockerfile.builder generated
View File

@ -4,11 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:bookworm-slim FROM debian:trixie-slim
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apt-get install --update -y \
apt-get install -y \
bzip2 \ bzip2 \
curl \ curl \
gcc \ gcc \
@ -16,13 +15,12 @@ RUN set -eux; \
make \ make \
patch \ patch \
; \ ; \
rm -rf /var/lib/apt/lists/* apt-get dist-clean
# grab/use buildroot for its uClibc toolchain # grab/use buildroot for its uClibc toolchain
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apt-get install --update -y \
apt-get install -y \
bc \ bc \
cpio \ cpio \
dpkg-dev \ dpkg-dev \
@ -34,7 +32,7 @@ RUN set -eux; \
unzip \ unzip \
wget \ wget \
; \ ; \
rm -rf /var/lib/apt/lists/* apt-get dist-clean
# pub dsa1024 2009-01-15 [SC] # pub dsa1024 2009-01-15 [SC]
# AB07 D806 D2CE 741F B886 EE50 B025 BA8B 59C3 6319 # AB07 D806 D2CE 741F B886 EE50 B025 BA8B 59C3 6319

0
latest/uclibc/amd64/blobs/sha256/49b3deb861d27a741ac5d50d64420c4975941605bbfa56b4b1d3fb5c5a2857bd → latest/uclibc/amd64/blobs/sha256/074cfec3bf2325aa3d14cbf00a02ed88b99b06cc8406b387aa7be4eb559861da
View File

0
latest/uclibc/amd64/blobs/sha256/3925d50bacb0bfc34464fb2f4e87764c69af0544f4b8334e2339113ff72d76cd → latest/uclibc/amd64/blobs/sha256/80f2b5906efd42a0151923a3dbbb08116933ea897fdd8bb0dc2d51d1b148286b
View File

2
latest/uclibc/amd64/image-config.json
View File

@ -11,7 +11,7 @@
"history": [ "history": [
{ {
"created": "2024-09-26T21:31:42Z", "created": "2024-09-26T21:31:42Z",
"created_by": "BusyBox 1.37.0 (uclibc), Buildroot 2025.05, Debian 12" "created_by": "BusyBox 1.37.0 (uclibc), Buildroot 2025.05, Debian 13"
} }
], ],
"rootfs": { "rootfs": {

2
latest/uclibc/amd64/image-manifest.json
View File

@ -3,7 +3,7 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": { "config": {
"mediaType": "application/vnd.oci.image.config.v1+json", "mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:49b3deb861d27a741ac5d50d64420c4975941605bbfa56b4b1d3fb5c5a2857bd", "digest": "sha256:074cfec3bf2325aa3d14cbf00a02ed88b99b06cc8406b387aa7be4eb559861da",
"size": 479 "size": 479
}, },
"layers": [ "layers": [

2
latest/uclibc/amd64/index.json
View File

@ -4,7 +4,7 @@
"manifests": [ "manifests": [
{ {
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:3925d50bacb0bfc34464fb2f4e87764c69af0544f4b8334e2339113ff72d76cd", "digest": "sha256:80f2b5906efd42a0151923a3dbbb08116933ea897fdd8bb0dc2d51d1b148286b",
"size": 610, "size": 610,
"platform": { "platform": {
"architecture": "amd64", "architecture": "amd64",