Merge pull request #61 from axiom-data-science/2-22

Bump Tomcat (10), JDK (17), and ERDDAP (2.22)
axiom-data-science · Jan 31, 2023 · 091b6b0 · 091b6b0
2 parents 08b9c1b + 000c24b
commit 091b6b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -21,10 +21,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - tag: "jdk8-openjdk"
-            base: "unidata/tomcat-docker:8.5@sha256:0d65eef935da7bc00242360269070261fb6e6428cb906aa4ce7509301a2216f9"
-          - tag: "jdk11-openjdk"
-            base: "unidata/tomcat-docker:8.5-jdk11-openjdk@sha256:1100d1ba623d66313e43acf921879dd7df1fc7aadb19bc1b273af4e4ab31a032"
+          - tag: "jdk17-openjdk"
+            base: "unidata/tomcat-docker:10.1.0-jdk17-openjdk@sha256:8b595bcd8eee410e2d610829b5d4e312d51e3ea6c6bde952a5838845f67a4839"
 
     steps:
     - name: Checkout
@@ -38,8 +36,6 @@ jobs:
           axiom/docker-erddap
         tags: |
           type=raw,value=${{ matrix.tag }},prefix=latest-
-          type=raw,value=latest,enable=${{ matrix.tag == 'jdk8-openjdk' }}
-          type=raw,value=${{ github.event.release.tag_name }},enable=${{ matrix.tag == 'jdk8-openjdk' && github.event_name == 'release' && github.event.action == 'published' }}
           type=raw,value=${{ github.event.release.tag_name }},suffix=-${{ matrix.tag }},enable=${{ github.event_name == 'release' && github.event.action == 'published' }}
 
     - name: Set up Docker Buildx
@@ -91,10 +87,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - tag: "jdk8-openjdk"
-            base: "unidata/tomcat-docker:8.5@sha256:0d65eef935da7bc00242360269070261fb6e6428cb906aa4ce7509301a2216f9"
-          - tag: "jdk11-openjdk"
-            base: "unidata/tomcat-docker:8.5-jdk11-openjdk@sha256:1100d1ba623d66313e43acf921879dd7df1fc7aadb19bc1b273af4e4ab31a032"
+          - tag: "jdk17-openjdk"
+            base: "unidata/tomcat-docker:10.1.0-jdk17-openjdk@sha256:8b595bcd8eee410e2d610829b5d4e312d51e3ea6c6bde952a5838845f67a4839"
 
     steps:
     - name: Checkout
@@ -108,8 +102,6 @@ jobs:
           axiom/docker-erddap
         tags: |
           type=raw,value=${{ matrix.tag }},prefix=latest-
-          type=raw,value=latest,enable=${{ matrix.tag == 'jdk8-openjdk' }}
-          type=raw,value=${{ github.event.release.tag_name }},enable=${{ matrix.tag == 'jdk8-openjdk' && github.event_name == 'release' && github.event.action == 'published' }}
           type=raw,value=${{ github.event.release.tag_name }},suffix=-${{ matrix.tag }},enable=${{ github.event_name == 'release' && github.event.action == 'published' }}
 
     - name: Set up Docker Buildx

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-ARG BASE_IMAGE=unidata/tomcat-docker:8.5@sha256:0d65eef935da7bc00242360269070261fb6e6428cb906aa4ce7509301a2216f9
+ARG BASE_IMAGE=unidata/tomcat-docker:10.1.0-jdk17-openjdk@sha256:8b595bcd8eee410e2d610829b5d4e312d51e3ea6c6bde952a5838845f67a4839
 FROM ${BASE_IMAGE}
 LABEL maintainer="Kyle Wilcox <[email protected]>"
 
-ARG ERDDAP_VERSION=2.18
+ARG ERDDAP_VERSION=2.22
 ARG ERDDAP_CONTENT_URL=https://github.com/BobSimons/erddap/releases/download/v$ERDDAP_VERSION/erddapContent.zip
 ARG ERDDAP_WAR_URL=https://github.com/BobSimons/erddap/releases/download/v$ERDDAP_VERSION/erddap.war
 ENV ERDDAP_bigParentDirectory /erddapData