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 to 2.25.1 #91

Closed
wants to merge 2 commits into from
Closed

bump to 2.25.1 #91

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abe34a8
bump to 2.25.1
ocefpaf Sep 11, 2024
98de2fb
Trigger Build
ocefpaf Nov 12, 2024
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
10 changes: 6 additions & 4 deletions .github/workflows/build_docker_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ 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
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@srstsavage should I revert this and let someone else submit this PR without a fork? OK is this OK for now?


jobs:
build:
Expand All @@ -24,11 +26,11 @@ jobs:
#amd64
- platform: "linux/amd64"
tag: "${{ vars.DOCKER_TAG }}"
base: "${{ vars.TOMCAT_AMD64_IMAGE }}"
base: "${{ TOMCAT_AMD64_IMAGE }}"
#arm64/v8
- platform: "linux/arm64/v8"
tag: "${{ vars.DOCKER_TAG }}"
base: "${{ vars.TOMCAT_ARM64_IMAGE }}"
base: "${{ TOMCAT_ARM64_IMAGE }}"

steps:
- name: Checkout
Expand Down Expand Up @@ -92,11 +94,11 @@ jobs:
#amd64
- platform: "linux/amd64"
tag: "${{ vars.DOCKER_TAG }}"
base: "${{ vars.TOMCAT_AMD64_IMAGE }}"
base: "${{ TOMCAT_AMD64_IMAGE }}"
#arm64/v8
- platform: "linux/arm64/v8"
tag: "${{ vars.DOCKER_TAG }}"
base: "${{ vars.TOMCAT_ARM64_IMAGE }}"
base: "${{ TOMCAT_ARM64_IMAGE }}"

steps:
- name: Checkout
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ COPY --from=unidata-tomcat-image ${CATALINA_HOME}/conf/web.xml ${CATALINA_HOME}/
# Security enhanced server.xml
COPY --from=unidata-tomcat-image ${CATALINA_HOME}/conf/server.xml ${CATALINA_HOME}/conf/

ARG ERDDAP_VERSION=2.24
ARG ERDDAP_CONTENT_URL=https://github.com/ERDDAP/erddap/releases/download/v$ERDDAP_VERSION/erddapContent.zip
ARG ERDDAP_WAR_URL=https://github.com/ERDDAP/erddap/releases/download/v$ERDDAP_VERSION/erddap.war
ARG ERDDAP_VERSION=2.25.1
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@srstsavage I believe you probably want to skip 2.25, right?

ARG ERDDAP_CONTENT_VERSION=1.0.0
ARG ERDDAP_CONTENT_URL="https://github.com/ERDDAP/erddapContent/archive/refs/tags/content${ERDDAP_CONTENT_VERSION}.zip"
ARG ERDDAP_WAR_URL="https://github.com/ERDDAP/erddap/releases/download/v${ERDDAP_VERSION}/erddap.war"
ENV ERDDAP_bigParentDirectory /erddapData

RUN apt-get update && apt-get install -y unzip xmlstarlet \
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ A feature full Tomcat (SSL over APR, etc.) running [ERDDAP](http://coastwatch.pf

Most recent versions:

* `axiom/docker-erddap:latest-jdk21-openjdk` (2.24)
* `axiom/docker-erddap:latest-jdk21-openjdk` (2.25.1)
* `axiom/docker-erddap:2.25.1-jdk21-openjdk`
* `axiom/docker-erddap:2.24-jdk21-openjdk`
* `axiom/docker-erddap:2.23-jdk17-openjdk`

Expand Down