Merge pull request #302 from LaurentGoderre/templating

Added templating

Author: yosifkit

.gitattributes

@@ -0,0 +1,3 @@
+/*/**/Dockerfile            linguist-generated
+/*/**/docker-entrypoint.sh  linguist-generated
+/Dockerfile*.template       linguist-language=Dockerfile

.gitignore

@@ -0,0 +1 @@
+.jq-template.awk

5.0/alpine/Dockerfile renamed to 5.0/alpine3.18/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:%%RUBY_VERSION%%-alpine3.18
+FROM ruby:{{ .ruby.version }}-{{ env.variant }}
 
 # explicitly set uid/gid to guarantee that it won't change in the future
 # the values 999:999 are identical to the current user/group id assigned
@@ -40,9 +40,9 @@ RUN set -eux; \
 	chown redmine:redmine "$HOME"; \
 	chmod 1777 "$HOME"
 
-ENV REDMINE_VERSION %%REDMINE_VERSION%%
-ENV REDMINE_DOWNLOAD_URL %%REDMINE_DOWNLOAD_URL%%
-ENV REDMINE_DOWNLOAD_SHA256 %%REDMINE_DOWNLOAD_SHA256%%
+ENV REDMINE_VERSION {{ .version }}
+ENV REDMINE_DOWNLOAD_URL {{ .downloadUrl }}
+ENV REDMINE_DOWNLOAD_SHA256 {{ .sha256 }}
 
 RUN set -eux; \
 	wget -O redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \

5.0/alpine/docker-entrypoint.sh renamed to 5.0/alpine3.18/docker-entrypoint.sh

@@ -1,4 +1,4 @@
-FROM ruby:%%RUBY_VERSION%%-slim-bookworm
+FROM ruby:{{ .ruby.version }}-slim-{{ env.variant }}
 
 # explicitly set uid/gid to guarantee that it won't change in the future
 # the values 999:999 are identical to the current user/group id assigned
@@ -43,9 +43,9 @@ RUN set -eux; \
 	chown redmine:redmine "$HOME"; \
 	chmod 1777 "$HOME"
 
-ENV REDMINE_VERSION %%REDMINE_VERSION%%
-ENV REDMINE_DOWNLOAD_URL %%REDMINE_DOWNLOAD_URL%%
-ENV REDMINE_DOWNLOAD_SHA256 %%REDMINE_DOWNLOAD_SHA256%%
+ENV REDMINE_VERSION {{ .version }}
+ENV REDMINE_DOWNLOAD_URL {{ .downloadUrl }}
+ENV REDMINE_DOWNLOAD_SHA256 {{ .sha256 }}
 
 RUN set -eux; \
 # if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)

5.0/Dockerfile renamed to 5.0/bookworm/Dockerfile

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+[ -f versions.json ] # run "versions.sh" first
+
+cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+jqt='.jq-template.awk'
+if [ -n "${BASHBREW_SCRIPTS:-}" ]; then
+	jqt="$BASHBREW_SCRIPTS/jq-template.awk"
+elif [ "$BASH_SOURCE" -nt "$jqt" ]; then
+	# https://github.com/docker-library/bashbrew/blob/master/scripts/jq-template.awk
+	wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/9f6a35772ac863a0241f147c820354e4008edf38/scripts/jq-template.awk'
+fi
+
+if [ "$#" -eq 0 ]; then
+	versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)"
+	eval "set -- $versions"
+fi
+
+generated_warning() {
+	cat <<-EOH
+		#
+		# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+		#
+		# PLEASE DO NOT EDIT IT DIRECTLY.
+		#
+
+	EOH
+}
+
+for version; do
+	export version
+
+	if [ -d "$version" ]; then
+		rm -rf "$version"
+	fi
+
+	if jq -e '.[env.version] | not' versions.json > /dev/null; then
+		echo "skipping $version ..."
+		continue
+	fi
+
+	variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)"
+	eval "variants=( $variants )"
+
+	for variant in "${variants[@]}"; do
+		export variant
+
+		echo "processing $version/$variant ..."
+
+		dir="$version${variant:+/$variant}"
+
+		mkdir -p "$dir"
+
+		cp -f docker-entrypoint.sh "$dir/"
+
+		case "$variant" in
+			alpine*)
+				template='Dockerfile-alpine.template'
+				sed -i -e 's/gosu/su-exec/g' "$dir/docker-entrypoint.sh"
+				;;
+			*)
+				template='Dockerfile-debian.template'
+				;;
+		esac
+
+		{
+			generated_warning
+			gawk -f "$jqt" "$template"
+		} > "$dir/Dockerfile"
+	done
+done

5.0/docker-entrypoint.sh renamed to 5.0/bookworm/docker-entrypoint.sh

@@ -9,11 +9,13 @@ declare -A aliases=(
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
-versions=( */ )
-versions=( "${versions[@]%/}" )
+if [ "$#" -eq 0 ]; then
+	versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)"
+	eval "set -- $versions"
+fi
 
 # sort version numbers with highest first
-IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -rV) ); unset IFS
+IFS=$'\n'; set -- $(sort -rV <<<"$*"); unset IFS
 
 # get the most recent commit which modified any of "$@"
 fileCommit() {
@@ -68,61 +70,49 @@ join() {
 	echo "${out#$sep}"
 }
 
-for version in "${versions[@]}"; do
-	# normally this would be down in the other loop, but "passenger" doesn't have it, so this is the simplest option (we just can't ever have "alpine" be out of sync, so we should remove it instead if it ever needs to be out of sync)
-	commit="$(dirCommit "$version")"
-	fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "ENV" && $2 == "REDMINE_VERSION" { print $3; exit }')"
+for version; do
+	export version
 
-	versionAliases=(
-		$fullVersion
+	variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)"
+	eval "variants=( $variants )"
+
+	alpine="$(jq -r '.[env.version].alpine' versions.json)"
+	debian="$(jq -r '.[env.version].debian' versions.json)"
+
+	fullVersion="$(jq -r '.[env.version].version' versions.json)"
+
+	versionAliases=()
+	while [ "$fullVersion" != "$version" -a "${fullVersion%[.]*}" != "$fullVersion" ]; do
+		versionAliases+=( $fullVersion )
+		fullVersion="${fullVersion%[.]*}"
+	done
+	versionAliases+=(
 		$version
 		${aliases[$version]:-}
 	)
 
-	for variant in '' passenger alpine; do
-		dir="$version${variant:+/$variant}"
-		[ -f "$dir/Dockerfile" ] || continue
-
+	for variant in "${variants[@]}"; do
+		dir="$version/$variant"
 		commit="$(dirCommit "$dir")"
 
-		if [ -n "$variant" ]; then
-			variantAliases=( "${versionAliases[@]/%/-$variant}" )
-			variantAliases=( "${variantAliases[@]//latest-/}" )
-		else
-			variantAliases=( "${versionAliases[@]}" )
-		fi
-
 		variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")"
+		variantArches="${parentRepoToArches[$variantParent]}"
 
-		suite="${variantParent#*:}" # "ruby:2.7-slim-bullseye", "2.7-alpine3.15"
-		suite="${suite##*-}" # "bullseye", "alpine3.15"
-		suite="${suite#alpine}" # "bullseye", "3.15"
+		variantAliases=( "${versionAliases[@]/%/-$variant}" )
+		variantAliases=( "${variantAliases[@]//latest-/}" )
 
 		case "$variant" in
-			alpine)
-				suite="alpine$suite" # "alpine3.8"
-				suiteAliases=( "${versionAliases[@]/%/-$suite}" )
+			"$debian")
+				variantAliases=(
+					"${versionAliases[@]}"
+					"${variantAliases[@]}"
+				)
 				;;
-			passenger)
-				# the "passenger" variant doesn't get any extra aliases (sorry)
-				suiteAliases=()
-				;;
-			*)
-				suiteAliases=( "${variantAliases[@]/%/-$suite}" )
+			alpine"$alpine")
+				variantAliases+=( "${versionAliases[@]/%/-alpine}" )
+				variantAliases=( "${variantAliases[@]//latest-/}" )
 				;;
 		esac
-		suiteAliases=( "${suiteAliases[@]//latest-/}" )
-		variantAliases+=( "${suiteAliases[@]}" )
-
-		case "$variant" in
-			passenger) variantArches='amd64' ;; # https://github.com/docker-library/redmine/pull/87#issuecomment-323877678
-			*) variantArches="${parentRepoToArches[$variantParent]}" ;;
-		esac
-
-		if [ "$variant" != 'alpine' ]; then
-			# the "gosu" Debian package isn't available on mips64le
-			variantArches="$(sed <<<" $variantArches " -e 's/ mips64le / /g')"
-		fi
 
 		echo
 		cat <<-EOE