Skip to content

Commit

Permalink
Merge pull request #83 from axiom-data-science/more-version-update
Browse files Browse the repository at this point in the history
Update jdk versions in Docker tags
  • Loading branch information
srstsavage authored Aug 4, 2024
2 parents e727a0c + cd5dbb8 commit 450425d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build_docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
include:
#amd64
- platform: "linux/amd64"
tag: "jdk21-openjdk"
tag: "${{ vars.DOCKER_TAG }}"
base: "${{ vars.TOMCAT_AMD64_IMAGE }}"
#arm64/v8
- platform: "linux/arm64/v8"
tag: "jdk21-openjdk"
tag: "${{ vars.DOCKER_TAG }}"
base: "${{ vars.TOMCAT_ARM64_IMAGE }}"

steps:
Expand Down Expand Up @@ -91,11 +91,11 @@ jobs:
include:
#amd64
- platform: "linux/amd64"
tag: "jdk17-openjdk"
tag: "${{ vars.DOCKER_TAG }}"
base: "${{ vars.TOMCAT_AMD64_IMAGE }}"
#arm64/v8
- platform: "linux/arm64/v8"
tag: "jdk17-openjdk"
tag: "${{ vars.DOCKER_TAG }}"
base: "${{ vars.TOMCAT_ARM64_IMAGE }}"

steps:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ A feature full Tomcat (SSL over APR, etc.) running [ERDDAP](http://coastwatch.pf

Most recent versions:

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

See all versions available [here](https://hub.docker.com/r/axiom/docker-erddap/tags). As always, consult the [ERDDAP Changes](https://coastwatch.pfeg.noaa.gov/erddap/download/changes.html) documentation before upgrading your server.
Expand All @@ -17,7 +17,7 @@ Use any of the `latest-*` images with caution as they follow the upstream image,
## Quickstart

```bash
docker run -d -p 8080:8080 axiom/docker-erddap:latest-jdk17-openjdk
docker run -d -p 8080:8080 axiom/docker-erddap:latest-jdk21-openjdk
```

## Running ERDDAP CLI Tools
Expand Down

0 comments on commit 450425d

Please sign in to comment.