From a155fa9559eb1811bcb56dccf28cf64e15471241 Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Fri, 1 Dec 2023 15:51:53 +0100 Subject: [PATCH] Publish 3.5.4 release version --- .github/workflows/docker-image.yml | 4 ++-- 3.5/Dockerfile | 2 +- 3.5/DockerfileJdk17 | 2 +- README.md | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index eb7b47e..3127007 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -63,7 +63,7 @@ jobs: context: ./3.5 platforms: linux/amd64,linux/arm64 push: true - tags: tfr42/deegree:3.5.2,tfr42/deegree:3.5,tfr42/deegree:latest + tags: tfr42/deegree:3.5.4,tfr42/deegree:3.5,tfr42/deegree:latest build-3_5_jdk17: runs-on: ubuntu-latest steps: @@ -82,4 +82,4 @@ jobs: file: ./3.5/DockerfileJdk17 platforms: linux/amd64,linux/arm64 push: true - tags: tfr42/deegree:3.5.2-jdk17-tomcat10,tfr42/deegree:3.5-jdk17-tomcat10,tfr42/deegree:3.5-jdk17 \ No newline at end of file + tags: tfr42/deegree:3.5.4-jdk17-tomcat10,tfr42/deegree:3.5-jdk17-tomcat10,tfr42/deegree:3.5-jdk17 \ No newline at end of file diff --git a/3.5/Dockerfile b/3.5/Dockerfile index 2f5649b..1ecac0c 100644 --- a/3.5/Dockerfile +++ b/3.5/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get -yq install zip LABEL maintainer="Torsten Friebe " # set deegree version -ARG DEEGREE_VERSION=3.5.2 +ARG DEEGREE_VERSION=3.5.4 ENV DEEGREE_WORKSPACE_ROOT=/root/.deegree ENV CATALINA_OPTS="-Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Dlog.dir=$CATALINA_HOME/logs" diff --git a/3.5/DockerfileJdk17 b/3.5/DockerfileJdk17 index 4cd86c9..13e126d 100644 --- a/3.5/DockerfileJdk17 +++ b/3.5/DockerfileJdk17 @@ -19,9 +19,9 @@ FROM tomcat:10.1.12-jdk17 AS runner LABEL maintainer="Torsten Friebe " -ENV DEEGREE_WORKSPACE_ROOT=/root/.deegree ENV CATALINA_OPTS="-Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Dlog.dir=$CATALINA_HOME/logs" ENV JAVA_OPTS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-exports java.desktop/sun.swing=ALL-UNNAMED --add-exports java.desktop/sun.awt=ALL-UNNAMED" +ENV DEEGREE_WORKSPACE_ROOT=/root/.deegree VOLUME $DEEGREE_WORKSPACE_ROOT WORKDIR /usr/local/tomcat/webapps/ # copy deegree war file from builder diff --git a/README.md b/README.md index b9722ff..be3ff57 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@ This projects contains different Docker containers for deegree webservices. Plea for further information how to configure and use deegree web services. The [Docker web site](https://www.docker.com/) provides all information about Docker! -## Run deegree with PostgreSQL 14/PostGIS 3.3 +## Run deegree with PostgreSQL 14/PostGIS 3.4 Get docker image for PostgreSQL DB and start the container: - % docker pull postgis/postgis:14-3.3 - % docker run -p 5432:5432 --name db -d postgis/postgis:14-3.3 + % docker pull postgis/postgis:14-3.4 + % docker run -p 5432:5432 --name db -e POSTGRES_PASSWORD=secretpassword -d postgis/postgis:14-3.4 see https://hub.docker.com/r/postgis/postgis/ for more information.