docker-library · tianon · Sep 26, 2025 · Sep 25, 2025 · Sep 25, 2025 · Sep 25, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,6 +24,7 @@ jobs:
         name: Generate Jobs
         run: |
           strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")"
+          strategy="$("$BASHBREW_SCRIPTS/github-actions/munge-i386.sh" -c <<<"$strategy")"
           echo "strategy=$strategy" >> "$GITHUB_OUTPUT"
           jq . <<<"$strategy" # sanity check / debugging aid
 

diff --git a/6.1/alpine3.21/Dockerfile b/6.1/alpine3.21/Dockerfile
diff --git a/6.1/alpine3.22/Dockerfile b/6.1/alpine3.22/Dockerfile
diff --git a/6.1/bookworm/Dockerfile b/6.1/bookworm/Dockerfile
diff --git a/6.1/bookworm/docker-entrypoint.sh b/6.1/bookworm/docker-entrypoint.sh
diff --git a/6.1/trixie/Dockerfile b/6.1/trixie/Dockerfile
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -163,7 +163,12 @@ ENV BUNDLE_FORCE_RUBY_PLATFORM 1
 				"ttf2ufm",
 				"zlib-dev",
 				empty
-			else empty end,
+			else
+				# 6.1+ needs to compile some extensions on non-amd64-non-arm64 architectures
+				"cargo",
+				"clang19-dev", # TODO the dep needing libclang.so doesn't seem to care what version, so maybe there's a more generic dep we could use here?
+				empty
+			end,
 			empty
 		else
 			# debian packages
@@ -175,6 +180,12 @@ ENV BUNDLE_FORCE_RUBY_PLATFORM 1
 			"libyaml-dev",
 			"pkgconf",
 			"xz-utils",
+			if IN(env.version; "5.1", "6.0") then empty else
+				# 6.1+ needs to compile some extensions on non-amd64-non-arm64 architectures
+				"cargo",
+				"libclang-dev",
+				empty
+			end,
 			empty
 		end
 	] | sort | (

diff --git a/versions.json b/versions.json
@@ -41,7 +41,6 @@
     "sha256": "bc483da195f2444491d870e40f7fc909ae750f7ba8d0e28831e6d6c478812b88",
     "variants": [
       "trixie",
-      "bookworm",
       "alpine3.22",
       "alpine3.21"
     ],