Merge pull request #111 from groovy/noble

Upgrade to Ubuntu Noble

Author: keeganwitt

.github/workflows/ci.yaml

@@ -17,29 +17,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version:
-          - 8-jdk-jammy
-          - 11-jdk-jammy
-          - 11-jdk-alpine
-          - 17-jdk-jammy
-          - 17-jdk-alpine
-          - 21-jdk-jammy
-          - 21-jdk-alpine
+        directory:
+          - jdk8
+          - jdk11
+          - jdk17
+          - jdk21
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: build
-        env:
-          version: ${{ matrix.version }}
         run: |
-          directory=$(echo "jdk${version}" | sed 's/-jdk//' | sed 's/-jammy//')
-          cd "${directory}"
-          docker pull "eclipse-temurin:${version}"
-          docker build --tag "groovy:${version}" .
+          cd "${{ matrix.directory }}"
+          grep "FROM " Dockerfile | cut -d' ' -f2 | xargs -I{} docker pull {}
+          docker build --tag "groovy:${{ matrix.directory }}" .
       - name: test
         env:
-          version: ${{ matrix.version }}
           expectedGroovyVersion: 4.0.27
         run: |
           cd test
-          ./run.sh "groovy:${version}" "${expectedGroovyVersion}"
+          ./run.sh "groovy:${{ matrix.directory }}" "${expectedGroovyVersion}"

generate-stackbrew-library.sh

@@ -104,7 +104,7 @@ for dir in "${directories[@]}"; do
 
 	fromTag="${from##*:}"
 	suite="${fromTag%-jdk}"
-	suite="${suite##*-}" # "noble", "jammy", "al2023", etc
+	suite="${suite##*-}" # "noble", "jammy", etc
 	jdk="${dir%%-*}" # "jdk8", etc
 
 	# identify image "variant" so we can assign tags based on variant

jdk17/Dockerfile

@@ -1,13 +1,15 @@
-FROM eclipse-temurin:17-jdk-jammy
+FROM eclipse-temurin:17-jdk-noble
 
 CMD ["groovysh"]
 
 ENV GROOVY_HOME=/opt/groovy
 
 RUN set -o errexit -o nounset \
-    && echo "Adding groovy user and group" \
-    && groupadd --system --gid 1000 groovy \
-    && useradd --system --gid groovy --uid 1000 --shell /bin/bash --create-home groovy \
+    && echo "Renaming ubuntu user and group to groovy" \
+    && groupmod --new-name groovy ubuntu \
+    && mkdir /home/groovy \
+    && usermod --login groovy --home /home/groovy --groups groovy ubuntu \
+    && chown groovy /home/groovy \
     && mkdir --parents /home/groovy/.groovy/grapes \
     && chown --recursive groovy:groovy /home/groovy \
     && chmod --recursive 1777 /home/groovy \

jdk21/Dockerfile

@@ -1,13 +1,15 @@
-FROM eclipse-temurin:21-jdk-jammy
+FROM eclipse-temurin:21-jdk-noble
 
 CMD ["groovysh"]
 
 ENV GROOVY_HOME=/opt/groovy
 
 RUN set -o errexit -o nounset \
-    && echo "Adding groovy user and group" \
-    && groupadd --system --gid 1000 groovy \
-    && useradd --system --gid groovy --uid 1000 --shell /bin/bash --create-home groovy \
+    && echo "Renaming ubuntu user and group to groovy" \
+    && groupmod --new-name groovy ubuntu \
+    && mkdir /home/groovy \
+    && usermod --login groovy --home /home/groovy --groups groovy ubuntu \
+    && chown groovy /home/groovy \
     && mkdir --parents /home/groovy/.groovy/grapes \
     && chown --recursive groovy:groovy /home/groovy \
     && chmod --recursive 1777 /home/groovy \