Merge pull request #117 from groovy/multiple-versions

Create images for all supported Groovy versions

Author: keeganwitt

.github/workflows/ci.yaml

@@ -16,22 +16,35 @@ jobs:
   ci:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        directory:
+        groovy-version:
+          - groovy-3
+          - groovy-4
+          - groovy-5
+        java-version:
+          - jdk8
           - jdk11
           - jdk17
           - jdk21
+        variant:
+          - ''
+          - '-alpine'
+        exclude:
+          - groovy-version: groovy-5
+            java-version: jdk8
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: build
         run: |
-          cd "${{ matrix.directory }}"
+          cd "${{ matrix.groovy-version }}/${{ matrix.java-version }}${{ matrix.variant }}"
           grep "FROM " Dockerfile | cut -d' ' -f2 | xargs -I{} docker pull {}
-          docker build --tag "groovy:${{ matrix.directory }}" .
+          docker build --tag "groovy:${{ matrix.groovy-version }}-${{ matrix.java-version }}${{ matrix.variant }}" .
       - name: test
-        env:
-          expectedGroovyVersion: 5.0.4
         run: |
+          # Extract version from Dockerfile
+          groovyVersion=$(grep "ENV GROOVY_VERSION=" "${{ matrix.groovy-version }}/${{ matrix.java-version }}${{ matrix.variant }}/Dockerfile" | cut -d= -f2)
+          
           cd test
-          ./run.sh "groovy:${{ matrix.directory }}" "${expectedGroovyVersion}"
+          ./run.sh "groovy:${{ matrix.groovy-version }}-${{ matrix.java-version }}${{ matrix.variant }}" "${groovyVersion}"

README.md

@@ -2,13 +2,31 @@
 
 ## Supported tags and respective Dockerfile links
 
-* [jdk8](https://github.com/groovy/docker-groovy/blob/master/jdk8/Dockerfile)
-* [jdk11](https://github.com/groovy/docker-groovy/blob/master/jdk11/Dockerfile)
-* [jdk11-alpine](https://github.com/groovy/docker-groovy/blob/master/jdk11-alpine/Dockerfile)
-* [jdk17](https://github.com/groovy/docker-groovy/blob/master/jdk17/Dockerfile)
-* [jdk17-alpine](https://github.com/groovy/docker-groovy/blob/master/jdk17-alpine/Dockerfile)
-* [jdk21](https://github.com/groovy/docker-groovy/blob/master/jdk21/Dockerfile)
-* [jdk21-alpine](https://github.com/groovy/docker-groovy/blob/master/jdk21-alpine/Dockerfile)
+* Groovy 3
+    * [jdk8](https://github.com/groovy/docker-groovy/blob/master/groovy-3/jdk8/Dockerfile)
+    * [jdk8-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-3/jdk8-alpine/Dockerfile)
+    * [jdk11](https://github.com/groovy/docker-groovy/blob/master/groovy-3/jdk11/Dockerfile)
+    * [jdk11-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-3/jdk11-alpine/Dockerfile)
+    * [jdk17](https://github.com/groovy/docker-groovy/blob/master/groovy-3/jdk17/Dockerfile)
+    * [jdk17-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-3/jdk17-alpine/Dockerfile)
+    * [jdk21](https://github.com/groovy/docker-groovy/blob/master/groovy-3/jdk21/Dockerfile)
+    * [jdk21-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-3/jdk21-alpine/Dockerfile)
+* Groovy 4
+    * [jdk8](https://github.com/groovy/docker-groovy/blob/master/groovy-4/jdk8/Dockerfile)
+    * [jdk8-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-4/jdk8-alpine/Dockerfile)
+    * [jdk11](https://github.com/groovy/docker-groovy/blob/master/groovy-4/jdk11/Dockerfile)
+    * [jdk11-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-4/jdk11-alpine/Dockerfile)
+    * [jdk17](https://github.com/groovy/docker-groovy/blob/master/groovy-4/jdk17/Dockerfile)
+    * [jdk17-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-4/jdk17-alpine/Dockerfile)
+    * [jdk21](https://github.com/groovy/docker-groovy/blob/master/groovy-4/jdk21/Dockerfile)
+    * [jdk21-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-4/jdk21-alpine/Dockerfile)
+* Groovy 5
+    * [jdk11](https://github.com/groovy/docker-groovy/blob/master/groovy-5/jdk11/Dockerfile)
+    * [jdk11-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-5/jdk11-alpine/Dockerfile)
+    * [jdk17](https://github.com/groovy/docker-groovy/blob/master/groovy-5/jdk17/Dockerfile)
+    * [jdk17-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-5/jdk17-alpine/Dockerfile)
+    * [jdk21](https://github.com/groovy/docker-groovy/blob/master/groovy-5/jdk21/Dockerfile)
+    * [jdk21-alpine](https://github.com/groovy/docker-groovy/blob/master/groovy-5/jdk21-alpine/Dockerfile)
 
 ## What is Groovy?
 
@@ -70,10 +88,10 @@ Alternatively, you can specify this through the Grapes config, using `-D grape.c
 ## Instructions for a new Groovy release
 
 1. Run `update.sh <new Groovy version>` or `update.ps1 <new Groovy version>`.
-1. If a Groovy contributor did a release for the first time (his/her key added to https://downloads.apache.org/groovy/KEYS),
+2. If a Groovy contributor did a release for the first time (his/her key added to https://downloads.apache.org/groovy/KEYS),
 add the new key to the list of keys used for verification (this is quite infrequent).
-1. Commit and push the changes.
-1. Update [official-images](https://github.com/docker-library/official-images) (and [docs](https://github.com/docker-library/docs) if appropriate).
+3. Commit and push the changes.
+4. Update [official-images](https://github.com/docker-library/official-images) (and [docs](https://github.com/docker-library/docs) if appropriate).
 
 ---
 [![Build status badge](https://github.com/groovy/docker-groovy/workflows/GitHub%20CI/badge.svg)](https://github.com/groovy/docker-groovy/actions?query=workflow%3A%22GitHub+CI%22)

generate-stackbrew-library.ps1

@@ -7,8 +7,6 @@ $ErrorActionPreference = "Stop"
 # front-load the "command-not-found" notices
 bashbrew --version > $null
 
-$gitRemote = (git remote -v | Select-String 'groovy/docker-groovy' | ForEach-Object { $_.Line.Split()[0] })[0]
-
 @"
 Maintainers: Keegan Witt <[email protected]> (@keeganwitt)
 GitRepo: https://github.com/groovy/docker-groovy.git
@@ -17,10 +15,10 @@ GitRepo: https://github.com/groovy/docker-groovy.git
 $usedTags = @{}
 $archesLookupCache = @{}
 
-$commit = git rev-parse "refs/remotes/$gitRemote/master"
+$commit = git rev-parse HEAD
+$branch = git rev-parse --abbrev-ref HEAD
 $common = @"
-GitFetch: refs/heads/master
-GitCommit: $commit
+GitFetch: refs/heads/$branch
 "@
 
 $allDirectories = git ls-tree -r --name-only "$commit" |
@@ -29,7 +27,12 @@ $allDirectories = git ls-tree -r --name-only "$commit" |
 
 $directoriesWithSortKeys = @()
 foreach ($dir in $allDirectories) {
-    $jdkPart = ($dir -split '-')[0] -replace 'jdk', ''
+    # dir is like groovy-3/jdk11
+    $groovyPart = $dir.Split('/')[0].Split('-')[1]
+    $groovyNum = [int]$groovyPart
+    $groovySort = -$groovyNum
+
+    $jdkPart = $dir.Split('/')[1].Split('-')[0] -replace 'jdk', ''
     $jdkNum = [int]$jdkPart
 
     $primaryJdkSort = if ($jdkNum -in @(21, 17, 11, 8)) { 0 } else { 1 }
@@ -43,15 +46,15 @@ foreach ($dir in $allDirectories) {
 
     $directoriesWithSortKeys += [PSCustomObject]@{
         Directory = $dir
-        SortKeys = @($primaryJdkSort, $secondaryJdkSort, $variantSort, $suiteSort, $dir)
+        SortKeys = @($groovySort, $primaryJdkSort, $secondaryJdkSort, $variantSort, $suiteSort, $dir)
     }
 }
 
 $directories = $directoriesWithSortKeys |
-               Sort-Object -Property { $_.SortKeys[0] }, { $_.SortKeys[1] }, { $_.SortKeys[2] }, { $_.SortKeys[3] }, { $_.SortKeys[4] } |
+               Sort-Object -Property { $_.SortKeys[0] }, { $_.SortKeys[1] }, { $_.SortKeys[2] }, { $_.SortKeys[3] }, { $_.SortKeys[4] }, { $_.SortKeys[5] } |
                Select-Object -ExpandProperty Directory
 
-$firstVersion = $null
+$firstVersions = @{}
 foreach ($dir in $directories) {
     if (-not (Test-Path $dir)) {
         continue
@@ -65,16 +68,23 @@ foreach ($dir in $directories) {
         $version = "$version.0"
     }
 
-    if (-not $firstVersion) {
-        $firstVersion = $version
+    $majorVersion = $version.Split('.')[0]
+
+    if (-not $firstVersions.ContainsKey($majorVersion)) {
+        $firstVersions[$majorVersion] = $version
     }
-    if ($version -ne $firstVersion) {
-        Write-Error "$dir contains $version (compared to $firstVersion in $($directories[0]))"
+    if ($version -ne $firstVersions[$majorVersion]) {
+        Write-Error "$dir contains $version (compared to $($firstVersions[$majorVersion]) in other images of major version $majorVersion)"
     }
 
+    # Get the git commit for the specific directory
+    $majorDir = $dir -split '/' | Select-Object -First 1
+    $commit = git log -1 --format='%H' -- "$majorDir"
+
     $fromTag = $from.Split(':')[-1]
     $suite = $fromTag -replace '-jdk$', '' -replace '.*-', ''
-    $jdk = $dir.Split('-')[0]
+    $dirName = $dir | Split-Path -Leaf
+    $jdk = $dirName.Split('-')[0]
 
     switch -wildcard ($dir) {
         '*-alpine'   { $variant = 'alpine' }
@@ -100,7 +110,9 @@ foreach ($dir in $directories) {
     switch ($variant) {
         '' {
             $tags += $versions | ForEach-Object { "$_-$jdk-$suite" }
-            $tags += 'latest'
+            if ($version -match "^5\.") {
+                $tags += 'latest'
+            }
             $tags += $versions | ForEach-Object { "$_-jdk" }
             $tags += $versions
             $tags += $versions | ForEach-Object { "$_-jdk-$suite" }
@@ -109,6 +121,9 @@ foreach ($dir in $directories) {
         'alpine' {
             $tags += $versions | ForEach-Object { "$_-jdk-alpine" }
             $tags += $versions | ForEach-Object { "$_-alpine" }
+            if ($version -match "^5\.") {
+                $tags += 'alpine'
+            }
         }
     }
 
@@ -136,6 +151,7 @@ foreach ($dir in $directories) {
 Tags: $actualTagsString
 Architectures: $arches
 $common
+GitCommit: $commit
 Directory: $dir
 "@
 }

generate-stackbrew-library.sh

@@ -9,19 +9,17 @@ set -o errexit -o nounset -o pipefail
 jq --version > /dev/null
 bashbrew --version > /dev/null
 
-gitRemote="$(git remote -v | awk '/groovy\/docker-groovy/ { print $1; exit }')"
-
 cat <<-'EOH'
 	Maintainers: Keegan Witt <[email protected]> (@keeganwitt)
 	GitRepo: https://github.com/groovy/docker-groovy.git
 EOH
 
-declare -A usedTags=() archesLookupCache=()
-commit="$(git rev-parse "refs/remotes/$gitRemote/master")"
+declare -A usedTags=() archesLookupCache=() seenVersions=()
+commit="$(git rev-parse HEAD)"
+branch="$(git rev-parse --abbrev-ref HEAD)"
 common="$(
 	cat <<-EOC
-		GitFetch: refs/heads/master
-		GitCommit: $commit
+		GitFetch: refs/heads/$branch
 	EOC
 )"
 
@@ -35,17 +33,25 @@ directories="$(
 		]
 		| sort_by(
 			# sort the list:
+			# - Groovy version in descending order
 			# - LTS JDK versions in descending order
 			# - non-LTS JDK versions in descending order
 			# - plain (temurin) variants above alpine
 			# - Ubuntu versions in descending release order
 			# (presorting the list makes tag calculation easier later because we can simply generate a list of tags each combination *could* have and let the first one to try get it, being careful not to reuse any)
 			(
-				ltrimstr("jdk")
+				split("/")[0]
+				| split("-")[1]
+				| tonumber
+			) as $groovy
+			| (
+				split("/")[1]
+				| ltrimstr("jdk")
 				| split("-")[0]
 				| tonumber
 			) as $jdk
 			| [
+				(-$groovy),
 				# LTS JDK versions above non-LTS
 				(
 					if $jdk | IN(21, 17, 11, 8) then 0
@@ -76,7 +82,7 @@ directories="$(
 )"
 eval "directories=( $directories )"
 
-firstVersion=
+
 for dir in "${directories[@]}"; do
 	# shellcheck disable=SC2001
 	dir="$(echo "$dir" | sed -e 's/[[:space:]]*$//')"
@@ -95,17 +101,25 @@ for dir in "${directories[@]}"; do
 		version="${version}.0"
 	fi
 
+	majorVersion="${version%%.*}"
+	
 	# double-check that each version matches the first one for this major (they should all be updated in lock-step)
-	[ -n "$firstVersion" ] || firstVersion="$version"
-	if [ "$version" != "$firstVersion" ]; then
-		echo >&2 "error: $dir contains $version (compared to $firstVersion in ${directories[0]})"
+	# declare -A firstVersions is not available in older bash, using variable indirection or assume bash 4+ (which is checked via declare -A usedTags)
+	: "${seenVersions[$majorVersion]:=$version}"
+	if [ "$version" != "${seenVersions[$majorVersion]}" ]; then
+		echo >&2 "error: $dir contains $version (compared to ${seenVersions[$majorVersion]} in other images of major version $majorVersion)"
 		exit 1
 	fi
 
+	# Get the git commit for the specific directory
+	majorDir="${dir%%/*}"
+	commit="$(git log -1 --format='%H' -- "$majorDir")"
+
 	fromTag="${from##*:}"
 	suite="${fromTag%-jdk}"
 	suite="${suite##*-}" # "noble", "jammy", etc
-	jdk="${dir%%-*}" # "jdk8", etc
+	dirName="${dir##*/}"
+	jdk="${dirName%%-*}" # "jdk8", etc
 
 	# identify image "variant" so we can assign tags based on variant
 	case "$dir" in
@@ -125,9 +139,14 @@ for dir in "${directories[@]}"; do
 	tags+=( "${versions[@]/%/-$jdk${variant:+-$variant}}" ) # "X.Y.Z-jdkNN-alpine"
 	case "$variant" in
 		'')
+			tags+=( "${versions[@]/%/-$jdk-$suite}" ) # "X.Y.Z-jdkNN-noble"
+
+			# Only add "latest" tag for Groovy 5
+			if [[ "$version" == 5.* ]]; then
+				tags+=( 'latest' )
+			fi
+
 			tags+=(
-				"${versions[@]/%/-$jdk-$suite}" # "X.Y.Z-jdkNN-noble"
-				'latest'
 				"${versions[@]/%/-jdk}" # "X.Y.Z-jdk"
 				"${versions[@]}" # "X.Y.Z"
 				"${versions[@]/%/-jdk-$suite}" # "X.Y.Z-jdk-noble"
@@ -139,6 +158,9 @@ for dir in "${directories[@]}"; do
 				"${versions[@]/%/-jdk-alpine}" # "X.Y.Z-jdk-alpine"
 				"${versions[@]/%/-alpine}" # "X.Y.Z-alpine"
 			)
+			if [[ "$version" == 5.* ]]; then
+				tags+=( 'alpine' )
+			fi
 			;;
 	esac
 
@@ -164,6 +186,7 @@ for dir in "${directories[@]}"; do
 		Tags: $actualTags
 		Architectures: $arches
 		$common
+		GitCommit: $commit
 		Directory: $dir
 	EOE
 done

jdk11-alpine/Dockerfile groovy-3/jdk11-alpine/Dockerfilejdk11-alpine/Dockerfile renamed to groovy-3/jdk11-alpine/Dockerfile

@@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes
 
 WORKDIR /home/groovy
 
-ENV GROOVY_VERSION=5.0.4
+ENV GROOVY_VERSION=3.0.25
 RUN set -o errexit -o nounset \
     && echo "Installing build dependencies" \
     && apk add --no-cache --virtual .build-deps \