diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml index ce6c4c2..c34e3fb 100644 --- a/.github/workflows/docker-image.yaml +++ b/.github/workflows/docker-image.yaml @@ -22,7 +22,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push v3.4 - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: ./3.4 platforms: linux/amd64,linux/arm64 @@ -40,12 +40,12 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push v3.5 - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: ./3.5 platforms: linux/amd64,linux/arm64 push: true - tags: deegree/deegree3-docker:3.5.8,deegree/deegree3-docker:3.5,deegree/deegree3-docker:latest + tags: deegree/deegree3-docker:3.5.9,deegree/deegree3-docker:3.5,deegree/deegree3-docker:latest build-3_6: runs-on: ubuntu-latest steps: @@ -58,7 +58,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push v3.6 - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: ./3.6 platforms: linux/amd64,linux/arm64 diff --git a/3.5/Dockerfile b/3.5/Dockerfile index eb5034a..de2b8d9 100644 --- a/3.5/Dockerfile +++ b/3.5/Dockerfile @@ -11,7 +11,7 @@ LABEL maintainer="deegree TMC " \ org.opencontainers.image.revision=$VCS_REF # set deegree version -ARG DEEGREE_VERSION=3.5.8 +ARG DEEGREE_VERSION=3.5.9 ENV DEEGREE_WORKSPACE_ROOT=/root/.deegree ENV CATALINA_OPTS="-Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Dlog.dir=$CATALINA_HOME/logs" ENV LANG en_US.UTF-8 diff --git a/3.6/Dockerfile b/3.6/Dockerfile index a48e6fe..9b70d83 100644 --- a/3.6/Dockerfile +++ b/3.6/Dockerfile @@ -11,7 +11,7 @@ LABEL maintainer="deegree TMC " \ org.opencontainers.image.revision=$VCS_REF # set deegree version -ARG DEEGREE_VERSION=3.6.0-pre2 +ARG DEEGREE_VERSION=3.6.0-pre3 # API key to use; if empty will not change API key ENV DEEGREE_API_KEY= diff --git a/README.md b/README.md index 4d43cb8..a65fd38 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # Supported tags and respective `Dockerfile` links - deegree 3.6.x (JDK 17/Tomcat 10.1): `3.6.0`, `3.6` - [Dockerfile](https://github.com/deegree/deegree3-docker/blob/main/3.6/Dockerfile) -- deegree 3.5.x (JDK 11/Tomcat 9): `3.5.8`, `3.5`, `latest` (deprecated tags: `3.5.7`, `3.5.6`, `3.5.5`, `3.5.4`, `3.5.3`, `3.5.2`, `3.5.1`, `3.5.0`) - [Dockerfile](https://github.com/deegree/deegree3-docker/blob/main/3.5/Dockerfile) +- deegree 3.5.x (JDK 11/Tomcat 9): `3.5.9`, `3.5`, `latest` (deprecated tags: `3.5.8`, `3.5.7`, `3.5.6`, `3.5.5`, `3.5.4`, `3.5.3`, `3.5.2`, `3.5.1`, `3.5.0`) - [Dockerfile](https://github.com/deegree/deegree3-docker/blob/main/3.5/Dockerfile) - deegree 3.4.x (JDK 8/Tomcat 8.5): `v3.4.35`, `v3.4`, `3.4` (deprecated tags: `v3.4.34`, `v3.4.33`, `v3.4.32`, `v3.4.31`, `v3.4.29`, `v3.4.28`, `v3.4.26`, `v3.4.25`, `v3.4.24`, `v3.4.23`, `v3.4.22`, `v3.4.20`, `v3.4.19`, `v3.4.18`, `v3.4.17`, `v3.4.16`, `v3.4.15`, `v3.4.14`, `v3.4.13`, `v3.4.12`, `v3.4.10`, `v3.4.9`, `v3.4.8`, `v3.4.7`, `v3.4.6`, `v3.4.5`, `v3.4.4`, `v3.4.3`, `v3.4.2`, `v3.4.1`, `v3.4.0`) - [Dockerfile](https://github.com/deegree/deegree3-docker/blob/main/3.4/Dockerfile) # Quick reference @@ -17,7 +17,7 @@ about Docker. ## Docker images on Docker hub -[![deegree-docker](http://dockeri.co/image/deegree/deegree3-docker)](https://hub.docker.com/r/deegree/deegree3-docker/) +[![deegree3-docker](https://dockeri.co/image/deegree/deegree3-docker)](https://hub.docker.com/r/deegree/deegree3-docker/) https://hub.docker.com/r/deegree/deegree3-docker/