Update Docker image GHA with new base images/runners

axiom-data-science · Aug 4, 2024 · 2fc5be4 · 2fc5be4
1 parent e5ea208
commit 2fc5be4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/push.yml → .github/workflows/build_docker_image.yml b/.github/workflows/push.yml → .github/workflows/build_docker_image.yml
@@ -1,4 +1,4 @@
-name: Push
+name: Build Docker images
 
 on:
   workflow_dispatch:
@@ -11,25 +11,26 @@ on:
 env:
   BUILDX_CACHE: /tmp/.buildx-cache
   CACHE_KEY: docker-erddap-buildx-
+  TOMCAT_AMD64_IMAGE: tomcat:10.1.26-jdk21-temurin-jammy@sha256:18952effb643bf192799e4ab2ca7c121d58871e96e5709fb5d405f4682a9aae7
+  TOMCAT_ARM64_IMAGE: tomcat:10.1.26-jdk21-temurin-jammy@sha256:4775c2227f16ee2726a35a1e97f43bfcb1a085cad23e169b1066ec9603826d8b
 
 jobs:
   build:
     name: Build and test Docker Image
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 10
 
     strategy:
-      #NOTE: make sure to replicate this matrix config in the push job below
       matrix:
         include:
           #amd64
           - platform: "linux/amd64"
             tag: "jdk17-openjdk"
-            base: "tomcat:10.1.16-jdk17-temurin-jammy@sha256:5d06ae2052b1a4c636454e65360a712fd262eebf574f8a97f37c2580edce7d46"
+            base: "${{ env.TOMCAT_AMD64_IMAGE }}"
           #arm64/v8
           - platform: "linux/arm64/v8"
             tag: "jdk17-openjdk"
-            base: "tomcat:10.1.16-jdk17-temurin-jammy@sha256:7d930ac5ba9091aa12c1a42e3cc7c59c12c8d032e076c3713c10bb9b35227b5d"
+            base: "${{ env.TOMCAT_ARM64_IMAGE }}"
 
     steps:
     - name: Checkout
@@ -82,7 +83,7 @@ jobs:
 
   push:
     name: Push latest image to Docker Hub
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 10
     needs: build
     if: (github.event_name == 'release' && github.event.action == 'published') || (github.ref == 'refs/heads/main') && github.repository == 'axiom-data-science/docker-erddap'
@@ -93,11 +94,11 @@ jobs:
           #amd64
           - platform: "linux/amd64"
             tag: "jdk17-openjdk"
-            base: "tomcat:10.1.16-jdk17-temurin-jammy@sha256:5d06ae2052b1a4c636454e65360a712fd262eebf574f8a97f37c2580edce7d46"
+            base: "${{ env.TOMCAT_AMD64_IMAGE }}"
           #arm64/v8
           - platform: "linux/arm64/v8"
             tag: "jdk17-openjdk"
-            base: "tomcat:10.1.16-jdk17-temurin-jammy@sha256:7d930ac5ba9091aa12c1a42e3cc7c59c12c8d032e076c3713c10bb9b35227b5d"
+            base: "${{ env.TOMCAT_ARM64_IMAGE }}"
 
     steps:
     - name: Checkout

diff --git a/.github/workflows/erddap_version.yml b/.github/workflows/erddap_version.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   version:
     name: Check the current ERDDAP version
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
     if: github.repository == 'axiom-data-science/docker-erddap'