Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Tomcat (10), JDK (17), and ERDDAP (2.22) #61

Merged
merged 3 commits into from
Jan 31, 2023
+6 −14
Merged

Bump Tomcat (10), JDK (17), and ERDDAP (2.22) #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59b40db
Build only with Tomcat 10 and JDK 17, save matrix for future expansion
kwilcox Jan 30, 2023
d8fcbb7
Bump ERDDAP to 2.22
kwilcox Jan 30, 2023
000c24b
Keep image names backwards compatible
kwilcox Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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' }}
Comment on lines 36 to 39
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think since these are already referenced as an output, we could use a job level output to share them across jobs rather than re-defining them, but that's not necessary to land this.


- name: Set up Docker Buildx
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <kyle@axiomdatascience.com>"

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
Expand Down