upstream merge

BlackflySolutions · Oct 16, 2024 · e61e58d · e61e58d
2 parents 6ef013a + 9f9de5c
commit e61e58d
Show file tree

Hide file tree

Showing 32 changed files with 83 additions and 82 deletions.
diff --git a/10.2/php8.2/apache-bookworm/Dockerfile b/10.2/php8.2/apache-bookworm/Dockerfile
diff --git a/10.2/php8.2/apache-bullseye/Dockerfile b/10.2/php8.2/apache-bullseye/Dockerfile
diff --git a/10.2/php8.2/fpm-alpine3.19/Dockerfile b/10.2/php8.2/fpm-alpine3.19/Dockerfile
diff --git a/10.2/php8.2/fpm-alpine3.20/Dockerfile b/10.2/php8.2/fpm-alpine3.20/Dockerfile
diff --git a/10.2/php8.2/fpm-bookworm/Dockerfile b/10.2/php8.2/fpm-bookworm/Dockerfile
diff --git a/10.2/php8.2/fpm-bullseye/Dockerfile b/10.2/php8.2/fpm-bullseye/Dockerfile
diff --git a/10.2/php8.3/apache-bookworm/Dockerfile b/10.2/php8.3/apache-bookworm/Dockerfile
diff --git a/10.2/php8.3/apache-bullseye/Dockerfile b/10.2/php8.3/apache-bullseye/Dockerfile
diff --git a/10.2/php8.3/fpm-alpine3.19/Dockerfile b/10.2/php8.3/fpm-alpine3.19/Dockerfile
diff --git a/10.2/php8.3/fpm-alpine3.20/Dockerfile b/10.2/php8.3/fpm-alpine3.20/Dockerfile
diff --git a/10.2/php8.3/fpm-bookworm/Dockerfile b/10.2/php8.3/fpm-bookworm/Dockerfile
diff --git a/10.2/php8.3/fpm-bullseye/Dockerfile b/10.2/php8.3/fpm-bullseye/Dockerfile
diff --git a/10.3/php8.2/apache-bookworm/Dockerfile b/10.3/php8.2/apache-bookworm/Dockerfile
diff --git a/10.3/php8.2/apache-bullseye/Dockerfile b/10.3/php8.2/apache-bullseye/Dockerfile
diff --git a/10.3/php8.2/fpm-alpine3.19/Dockerfile b/10.3/php8.2/fpm-alpine3.19/Dockerfile
diff --git a/10.3/php8.2/fpm-alpine3.20/Dockerfile b/10.3/php8.2/fpm-alpine3.20/Dockerfile
diff --git a/10.3/php8.2/fpm-bookworm/Dockerfile b/10.3/php8.2/fpm-bookworm/Dockerfile
diff --git a/10.3/php8.2/fpm-bullseye/Dockerfile b/10.3/php8.2/fpm-bullseye/Dockerfile
diff --git a/10.3/php8.3/apache-bookworm/Dockerfile b/10.3/php8.3/apache-bookworm/Dockerfile
diff --git a/10.3/php8.3/apache-bullseye/Dockerfile b/10.3/php8.3/apache-bullseye/Dockerfile
diff --git a/10.3/php8.3/fpm-alpine3.19/Dockerfile b/10.3/php8.3/fpm-alpine3.19/Dockerfile
diff --git a/10.3/php8.3/fpm-alpine3.20/Dockerfile b/10.3/php8.3/fpm-alpine3.20/Dockerfile
diff --git a/10.3/php8.3/fpm-bookworm/Dockerfile b/10.3/php8.3/fpm-bookworm/Dockerfile
diff --git a/10.3/php8.3/fpm-bullseye/Dockerfile b/10.3/php8.3/fpm-bullseye/Dockerfile
diff --git a/11.0/php8.3/apache-bookworm/Dockerfile b/11.0/php8.3/apache-bookworm/Dockerfile
diff --git a/11.0/php8.3/apache-bullseye/Dockerfile b/11.0/php8.3/apache-bullseye/Dockerfile
diff --git a/11.0/php8.3/fpm-alpine3.19/Dockerfile b/11.0/php8.3/fpm-alpine3.19/Dockerfile
diff --git a/11.0/php8.3/fpm-alpine3.20/Dockerfile b/11.0/php8.3/fpm-alpine3.20/Dockerfile
diff --git a/11.0/php8.3/fpm-bookworm/Dockerfile b/11.0/php8.3/fpm-bookworm/Dockerfile
diff --git a/11.0/php8.3/fpm-bullseye/Dockerfile b/11.0/php8.3/fpm-bullseye/Dockerfile
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -77,14 +77,15 @@ gawkParents='
 
 getArches() {
 	local repo="$1"; shift
+	local officialImagesBase="${BASHBREW_LIBRARY:-https://github.com/docker-library/official-images/raw/HEAD/library}/"
 
 	local parentRepoToArchesStr
 	parentRepoToArchesStr="$(
 		find -name 'Dockerfile' -exec gawk "$gawkParents" '{}' + \
 			| sort -u \
-			| gawk -v officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/' '
+			| gawk -v officialImagesBase="$officialImagesBase" '
 				$1 !~ /^('"$repo"'|scratch|.*\/.*)(:|$)/ {
-					printf "%s%s\n", officialImagesUrl, $1
+					printf "%s%s\n", officialImagesBase, $1
 				}
 			' \
 			| xargs -r bashbrew cat --format '["{{ .RepoName }}:{{ .TagName }}"]="{{ join " " .TagEntry.Architectures }}"'