Add back 6.1-bookworm but only for amd64 and arm64v8

Author: yosifkit

.github/workflows/ci.yml

@@ -25,6 +25,7 @@ jobs:
         run: |
           strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")"
           strategy="$("$BASHBREW_SCRIPTS/github-actions/munge-i386.sh" -c <<<"$strategy")"
+          strategy="$(jq -c <<<"$strategy" '.matrix.include = [ .matrix.include[] | select(.name | split("-") | (.[0] | split(".")[0:2] | join(".") | tonumber >= 6.1) and ( .[1] // "" | test("bookworm.*i386")) | not) ]')" # https://github.com/docker-library/redmine/pull/393 (6.1+ deps need newer rust on other arches and just isn't worth the trouble)
           echo "strategy=$strategy" >> "$GITHUB_OUTPUT"
           jq . <<<"$strategy" # sanity check / debugging aid
 

6.1/bookworm/Dockerfile

@@ -100,6 +100,15 @@ for version; do
 		variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")"
 		variantArches="${parentRepoToArches[$variantParent]}"
 
+		if [ "$variant" = 'bookworm' ] && [ "$version" != '5.1' ] && [ "$version" != '6.0' ]; then
+			# https://github.com/docker-library/redmine/pull/393 (6.1+ deps need newer rust on other arches and just isn't worth the trouble)
+			variantArches="$(jq <<<"$variantArches" --raw-input --raw-output '
+				split(" ")
+				| map(select(IN("amd64", "arm64v8")))
+				| join(" ")
+			')"
+		fi
+
 		variantAliases=( "${versionAliases[@]/%/-$variant}" )
 		variantAliases=( "${variantAliases[@]//latest-/}" )
 

6.1/bookworm/docker-entrypoint.sh

@@ -41,6 +41,7 @@
     "sha256": "bc483da195f2444491d870e40f7fc909ae750f7ba8d0e28831e6d6c478812b88",
     "variants": [
       "trixie",
+      "bookworm",
       "alpine3.22",
       "alpine3.21"
     ],

generate-stackbrew-library.sh

@@ -88,10 +88,6 @@ for version in "${versions[@]}"; do
 	get_version "$version"
 
 	for suite in "${supportedDebianSuites[@]}"; do
-		if [ "$suite" = 'bookworm' ] && [ "$version" != '5.1' ] && [ "$version" != '6.0' ]; then
-			# https://github.com/docker-library/redmine/pull/393 (6.1+ deps need newer rust on other arches and just isn't worth the trouble)
-			continue
-		fi
 		export suite
 		doc="$(jq <<<"$doc" -c '
 			.variants += [ env.suite ]