ops: update software versions for testing

Also update the actions configuration and add dependabot config.

Author: kerberizer

.github/dependabot.yml

@@ -0,0 +1,11 @@
+---
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    assignees:
+      - "kerberizer"

.github/workflows/build.yml

@@ -4,10 +4,12 @@ name: Build the ambit-docker images
 on:  # yamllint disable-line rule:truthy
   workflow_dispatch:
   repository_dispatch:
-    types: [ambit-repo-push]
+    types:
+      - ambit-repo-push
   push:
     branches:
       - master
+      - ci-updates
 
 jobs:
 
@@ -21,7 +23,7 @@ jobs:
     steps:
 
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6.0.1
 
       - name: Determining the RDBMS test matrix
         id: db
@@ -48,14 +50,15 @@ jobs:
           war_db="$( awk "${awk_get_war_from_db}" '${{ env.prefix }}/tags.txt')"
           echo "war-db=${war_db}" >> $GITHUB_OUTPUT
 
+
   build-ambit:
 
     needs: [set-test-matrices]
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-distribution: ['temurin', 'zulu']
-        java-version: [8, 11, 17]
+        java-distribution: ['temurin', 'corretto']
+        java-version: [8, 11, 17, 21, 25]
         rdbms-version: ${{ fromJson(needs.set-test-matrices.outputs.matrix-db) }}
       fail-fast: false
     env:
@@ -66,14 +69,14 @@ jobs:
     steps:
 
       - name: Checkout the AMBIT repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6.0.1
         with:
           repository: ideaconsult/ambit-mirror
           ref: ${{ github.event.client_payload.sha }}
           token: ${{ secrets.GH_R_PR }}
 
       - name: 'Set up OpenJDK: ${{ matrix.java-distribution }}/${{ matrix.java-version }}'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5.1.0
         with:
           distribution: ${{ matrix.java-distribution }}
           java-version: ${{ matrix.java-version }}
@@ -91,7 +94,7 @@ jobs:
           ln -s -t /usr/bin "/opt/apache-maven-${maven_version}/bin/mvn"
 
       - name: Cache the local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4.3.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -184,14 +187,18 @@ jobs:
         run: docker stop "${rdbms_ctnr_name}"
 
       - name: Save the newly build WAR
-        # Only the one tested with the RDBMS marked with our "latest" image tag
-        if: ${{ matrix.rdbms-version == needs.set-test-matrices.outputs.war-db }}
-        uses: actions/upload-artifact@v3
+        # Only the one tested with the RDBMS marked with our "latest" image tag,
+        # and only for the Java distribution that we build our images with.
+        if: >
+          matrix.rdbms-version == needs.set-test-matrices.outputs.war-db &&
+          matrix.java-distribution == 'temurin'
+        uses: actions/upload-artifact@v5.0.0
         with:
           name: ambit-war-java${{ matrix.java-version }}
           path: ambit2-apps/ambit2-www/target/ambit2.war
           retention-days: 1
 
+
   set-build-matrices:
 
     runs-on: ubuntu-latest
@@ -203,7 +210,7 @@ jobs:
     steps:
 
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6.0.1
 
       - name: Determining the ambit-api build matrix
         id: api
@@ -225,6 +232,7 @@ jobs:
           jq . <<<"$matrix_json" # lint
           echo "matrix=${matrix_json}" >> $GITHUB_OUTPUT
 
+
   build-images-api:
 
     needs: [build-ambit, set-build-matrices]
@@ -239,15 +247,15 @@ jobs:
     steps:
 
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6.0.1
 
       - name: Identify the OpenJDK version
         run: |
           export java_version="$(echo ${{ matrix.ver }} | sed 's|.*-jdk\([[:digit:]]\+\)-.*|\1|')"
           echo "java_version=${java_version}" >>"$GITHUB_ENV"
 
       - name: Load the latest WAR for the required OpenJDK version
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v6.0.0
         with:
           name: ambit-war-java${{ env.java_version }}
           path: ./ci/${{ env.image }}/${{ matrix.ver }}
@@ -264,29 +272,38 @@ jobs:
           echo "image_tags=${tags_list:1}" >>"$GITHUB_ENV"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3.11.1
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3.6.0
         with:
           registry: ghcr.io
-          username: idea-docker
-          password: ${{ secrets.GH_CR_FA }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3.6.0
         with:
-          username: kerberizer
+          username: ${{ secrets.DCKR_USER }}
           password: ${{ secrets.DCKR_TOKEN }}
 
       - name: Build the ambit-api image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6.18.0
         with:
           context: ./ci/${{ env.image }}/${{ matrix.ver }}
+          outputs: type=docker,dest=ambit-api.${{ matrix.ver }}.docker.tar
           pull: true
           push: ${{ github.ref == 'refs/heads/master' }}  # push only if we're on the master branch
           tags: ${{ env.image_tags }}
 
+      - name: Upload the built image as artifact for download
+        uses: actions/upload-artifact@v5.0.0
+        with:
+          name: ambit-api.${{ matrix.ver }}.docker.tar
+          path: ambit-api.${{ matrix.ver }}.docker.tar
+          retention-days: 3
+
+
   build-images-db:
 
     needs: set-build-matrices
@@ -301,7 +318,7 @@ jobs:
     steps:
 
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6.0.1
 
       - name: Determine the image tags
         run: >-
@@ -315,29 +332,38 @@ jobs:
           echo "image_tags=${tags_list:1}" >>"$GITHUB_ENV"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3.11.1
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3.6.0
         with:
           registry: ghcr.io
-          username: idea-docker
-          password: ${{ secrets.GH_CR_FA }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3.6.0
         with:
-          username: kerberizer
+          username: ${{ secrets.DCKR_USER }}
           password: ${{ secrets.DCKR_TOKEN }}
 
       - name: Build the ambit-db image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6.18.0
         with:
           context: ./ci/${{ env.image }}/${{ matrix.ver }}
+          outputs: type=docker,dest=ambit-db.${{ matrix.ver }}.docker.tar
           pull: true
           push: ${{ github.ref == 'refs/heads/master' }}  # push only if we're on the master branch
           tags: ${{ env.image_tags }}
 
+      - name: Upload the built image as artifact for download
+        uses: actions/upload-artifact@v5.0.0
+        with:
+          name: ambit-db.${{ matrix.ver }}.docker.tar
+          path: ambit-db.${{ matrix.ver }}.docker.tar
+          retention-days: 3
+
+
   integration-testing:
 
     needs: [build-images-api, build-images-db]
@@ -346,12 +372,12 @@ jobs:
     steps:
 
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6.0.1
 
-      - name: Spin up a default docker-compose setup
+      - name: Spin up a default Docker Compose setup
         run: |
-          docker-compose pull
-          docker-compose up --detach
+          docker compose pull
+          docker compose up --detach
 
       - name: Wait for the API to become operational
         run: |
@@ -363,8 +389,8 @@ jobs:
       - name: Run the API tests
         run: ./ci/run_integration_tests.sh
 
-      - name: Bring down the docker-compose setup
-        run: docker-compose down --volumes
+      - name: Bring down the Docker Compose setup
+        run: docker compose down --volumes
 
 # FIXME: Temporarily not sending notifications to Discord until we manage to send the final status.
 #  send-notifications:

README.md

@@ -99,9 +99,12 @@ ambit-db  | [ci/ambit-db/tags.txt](https://github.com/ideaconsult/ambit-docker/b
 
 ## Notes on specific versions
 
-* Java 11 and 17 are supported, but for maximum stability we still recommend Java 8 as the most thoroughly tested platform.
-* MySQL 8+ is *not* supported. We may add support for it in the future, but for the time being please use MariaDB instead.
-* Tomcat 10 is *not* supported and most likely will never be supported. We plan to transition to [Quarkus](https://quarkus.io/).
+* Java LTS versions up to and including 25 should work, of which Java 8 remains the most thoroughly tested platform.
+* There are many Java binary builds. We test [Eclispe Temurin](https://adoptium.net/), which is used in our Docker images, and [Amazon Corretto](https://aws.amazon.com/corretto/).
+* MySQL is *not* supported. If your organization requires such support, please contact us at `support@ideaconsult.net`.
+* MariaDB 11+ is *not yet* supported, but will be. Currently supported are the 10.x LTS versions.
+* For both Java and MariaDB we test only LTS releases that are still supported, e.g. Java 22 or MariaDB 10.5 are not tested.
+* Tomcat 10+ is *not* supported and most likely will never be supported. We plan to transition to [Quarkus](https://quarkus.io/).
 
 # Troubleshooting
 * If you hit the Docker Hub pull limits, use [GitHub Container Registry](https://github.com/orgs/ideaconsult/packages). You'll need to edit the docker compose files and prepend the `image` settings with `ghcr.io/`, e.g. `ideaconsult/ambit-db:latest` becomes `ghcr.io/ideaconsult/ambit-db:latest`.

ci/ambit-api/tags.txt

@@ -1,6 +1,5 @@
+tomcat9-jdk25-temurin     tomcat9-jdk25                 jdk25
+tomcat9-jdk21-temurin     tomcat9-jdk21                 jdk21
 tomcat9-jdk17-temurin     tomcat9-jdk17                 jdk17
 tomcat9-jdk11-temurin     tomcat9-jdk11                 jdk11
 tomcat9-jdk8-temurin      tomcat9-jdk8      tomcat9     jdk8    latest
-tomcat8.5-jdk17-temurin   tomcat8.5-jdk17
-tomcat8.5-jdk11-temurin   tomcat8.5-jdk11
-tomcat8.5-jdk8-temurin    tomcat8.5-jdk8    tomcat8.5

ci/ambit-api/tomcat8.5-jdk17-temurin/Dockerfile

@@ -1,4 +1,4 @@
-FROM tomcat:8.5-jdk8-temurin
+FROM tomcat:9-jdk21-temurin
 
 ENV AMBIT_CONFIG_OVERRIDE_DIR /opt/ambit/config_override
 

ci/ambit-api/tomcat8.5-jdk8-temurin/docker-entrypoint.sh

@@ -1,4 +1,4 @@
-FROM tomcat:8.5-jdk11-temurin
+FROM tomcat:9-jdk25-temurin
 
 ENV AMBIT_CONFIG_OVERRIDE_DIR /opt/ambit/config_override