Skip to content

Update to Debian Trixie #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yosifkit merged 2 commits into from
Aug 11, 2025
Merged

Update to Debian Trixie #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0ffe6a
Update to Debian Trixie
tianon Aug 8, 2025
fea97c0
Update metadata for amd64
tianon Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:
run: |
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-unstable.sh -c <<<"$strategy")"

EOF="EOF-$RANDOM-$RANDOM-$RANDOM"
echo "strategy<<$EOF" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -65,10 +64,4 @@ jobs:
- name: '"docker images"'
run: ${{ matrix.runs.images }}
- name: Git Diff # see "munge-build.sh"
run: |
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
run: git diff --exit-code
19 changes: 0 additions & 19 deletions .github/workflows/munge-unstable.sh
View file
Open in desktop

This file was deleted.

12 changes: 5 additions & 7 deletions Dockerfile-builder.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,25 @@ RUN set -eux; \
tar \
;
{{ ) else ( -}}
FROM debian:bookworm-slim
FROM debian:trixie-slim

RUN set -eux; \
apt-get update; \
apt-get install -y \
apt-get install --update -y \
bzip2 \
curl \
gcc \
gnupg \
make \
patch \
; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean
{{ ) end -}}
{{ if env.variant == "uclibc" then ( -}}

# grab/use buildroot for its uClibc toolchain

RUN set -eux; \
apt-get update; \
apt-get install -y \
apt-get install --update -y \
bc \
cpio \
dpkg-dev \
Expand All @@ -49,7 +47,7 @@ RUN set -eux; \
unzip \
wget \
; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

# pub dsa1024 2009-01-15 [SC]
# AB07 D806 D2CE 741F B886 EE50 B025 BA8B 59C3 6319
Expand Down
13 changes: 0 additions & 13 deletions hack-unstable.sh
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions latest-1/glibc/Dockerfile.builder
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...e8b05bad652be748ce7695a9137438a1e13bb0066 → ...7fbce2b445550eb2b18105e03f98102f00c0ec35e
View file
Open in desktop
File renamed without changes.
0 ...5b4472cdb639d59fe848f51df8d7d5ddd3dbd378e → ...c4ac5eef4439585bbbb817b7bd28b2cd87c742642
View file
Open in desktop
File renamed without changes.
0 ...37e6274297f4eb55b120635f73e2844408ae3ef13 → ...491b880e3b562e746a6645feb0dc8b3333a4973eb
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions latest-1/glibc/amd64/image-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"history": [
{
"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": {
"type": "layers",
"diff_ids": [
"sha256:2cdfc67c0816c2b7015081259eb6ac437b90828ef2a862e689b13afc14a2a4ab"
"sha256:b4cb8796a924c1fe5cf7031b67a551c63f9236c5cb0e0d51af962285ae361db7"
]
},
"architecture": "amd64",
Expand Down
6 changes: 3 additions & 3 deletions latest-1/glibc/amd64/image-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": {
"mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:ae1d923cbe21706d4f9677ce8b05bad652be748ce7695a9137438a1e13bb0066",
"digest": "sha256:1827167fde90df99d9341a27fbce2b445550eb2b18105e03f98102f00c0ec35e",
"size": 459
},
"layers": [
{
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"digest": "sha256:c464210ed74876e1229e7a337e6274297f4eb55b120635f73e2844408ae3ef13",
"size": 2141232
"digest": "sha256:a9739a817d63534f3c8ceef491b880e3b562e746a6645feb0dc8b3333a4973eb",
"size": 2209397
}
],
"annotations": {
Expand Down
2 changes: 1 addition & 1 deletion latest-1/glibc/amd64/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"manifests": [
{
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:8cac9c34e220de273cc3f255b4472cdb639d59fe848f51df8d7d5ddd3dbd378e",
"digest": "sha256:4a35a7836fe08f340a42e25c4ac5eef4439585bbbb817b7bd28b2cd87c742642",
"size": 610,
"platform": {
"architecture": "amd64",
Expand Down
12 changes: 5 additions & 7 deletions latest-1/uclibc/Dockerfile.builder
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...5f2a3f120f539e454b082bc56c1a8e79dd2512a53 → ...6ba5bc0ed277fd5963cc0bde943b8bb0ec9c4fab5
View file
Open in desktop
File renamed without changes.
0 ...5f5ff3525ad2f1dd0aa685d0a27e46c861c5213f9 → ...3e180d61bce7aa3aa53743660bb27a0d45846e279
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion latest-1/uclibc/amd64/image-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"history": [
{
"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": {
Expand Down
2 changes: 1 addition & 1 deletion latest-1/uclibc/amd64/image-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": {
"mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:3db602a468789d708e82e375f2a3f120f539e454b082bc56c1a8e79dd2512a53",
"digest": "sha256:4fb74a405d9e8feaeec494a6ba5bc0ed277fd5963cc0bde943b8bb0ec9c4fab5",
"size": 479
},
"layers": [
Expand Down
2 changes: 1 addition & 1 deletion latest-1/uclibc/amd64/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"manifests": [
{
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:23bc5e7f8d62948c998cc645f5ff3525ad2f1dd0aa685d0a27e46c861c5213f9",
"digest": "sha256:f32f881fc2df7e7167e394b3e180d61bce7aa3aa53743660bb27a0d45846e279",
"size": 610,
"platform": {
"architecture": "amd64",
Expand Down
7 changes: 3 additions & 4 deletions latest/glibc/Dockerfile.builder
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...9e88c53368926b2fe0e1fb985d6e8a70040520c4d → ...fff25edb3e79f153d37d274e5c2936923c38dac2b
View file
Open in desktop
File renamed without changes.
0 ...3fbc3b719d47bccac0e9bf0a21c77a27cba9ef12d → ...44876f63b39694e16ce08ae6296e97686c52b150c
View file
Open in desktop
File renamed without changes.
0 ...38948dfd5e8efdcf6c444fe92371ea0f01750bf8c → ...6f5bdccb8ca289387946e406e6f24053f6a8e8494
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions latest/glibc/amd64/image-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"history": [
{
"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": {
"type": "layers",
"diff_ids": [
"sha256:65014c70e84b6817fac42bb201ec5c1ea460a8da246cac0e481f5c9a9491eac0"
"sha256:80e840de630d08a6a1e0ee30e7c8378cf1ed6a424315d7e437f54780aee6bf5a"
]
},
"architecture": "amd64",
Expand Down
6 changes: 3 additions & 3 deletions latest/glibc/amd64/image-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": {
"mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:6d3e4188a38af91b0c1577b9e88c53368926b2fe0e1fb985d6e8a70040520c4d",
"digest": "sha256:0ed463b26daee791b094dc3fff25edb3e79f153d37d274e5c2936923c38dac2b",
"size": 459
},
"layers": [
{
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"digest": "sha256:90b9666d4aed1893ff122f238948dfd5e8efdcf6c444fe92371ea0f01750bf8c",
"size": 2145249
"digest": "sha256:80bfbb8a41a2b27d93763e96f5bdccb8ca289387946e406e6f24053f6a8e8494",
"size": 2213082
}
],
"annotations": {
Expand Down
2 changes: 1 addition & 1 deletion latest/glibc/amd64/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"manifests": [
{
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:7c0ffe5751238c8479f952f3fbc3b719d47bccac0e9bf0a21c77a27cba9ef12d",
"digest": "sha256:182014572d8981d8323fe9944876f63b39694e16ce08ae6296e97686c52b150c",
"size": 610,
"platform": {
"architecture": "amd64",
Expand Down
12 changes: 5 additions & 7 deletions latest/uclibc/Dockerfile.builder
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...d64420c4975941605bbfa56b4b1d3fb5c5a2857bd → ...00a02ed88b99b06cc8406b387aa7be4eb559861da
View file
Open in desktop
File renamed without changes.
0 ...f4e87764c69af0544f4b8334e2339113ff72d76cd → ...3dbbb08116933ea897fdd8bb0dc2d51d1b148286b
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion latest/uclibc/amd64/image-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"history": [
{
"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": {
Expand Down
2 changes: 1 addition & 1 deletion latest/uclibc/amd64/image-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": {
"mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:49b3deb861d27a741ac5d50d64420c4975941605bbfa56b4b1d3fb5c5a2857bd",
"digest": "sha256:074cfec3bf2325aa3d14cbf00a02ed88b99b06cc8406b387aa7be4eb559861da",
"size": 479
},
"layers": [
Expand Down
2 changes: 1 addition & 1 deletion latest/uclibc/amd64/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"manifests": [
{
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:3925d50bacb0bfc34464fb2f4e87764c69af0544f4b8334e2339113ff72d76cd",
"digest": "sha256:80f2b5906efd42a0151923a3dbbb08116933ea897fdd8bb0dc2d51d1b148286b",
"size": 610,
"platform": {
"architecture": "amd64",
Expand Down
Loading