Merge pull request #226 from infosiftr/trixie

Update to Debian Trixie

Author: yosifkit

.github/workflows/ci.yml

@@ -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"
@@ -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

.github/workflows/munge-unstable.sh

@@ -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 \
@@ -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

Dockerfile-builder.template

@@ -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",

hack-unstable.sh

@@ -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": {