Skip to content

Commit

Permalink
Publish 3.5.4 release version
Browse files Browse the repository at this point in the history
  • Loading branch information
tfr42 committed Dec 1, 2023
1 parent cefa795 commit a155fa9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
tags: tfr42/deegree:3.5.4-jdk17-tomcat10,tfr42/deegree:3.5-jdk17-tomcat10,tfr42/deegree:3.5-jdk17
2 changes: 1 addition & 1 deletion 3.5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && apt-get -yq install zip
LABEL maintainer="Torsten Friebe <[email protected]>"

# 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"

Expand Down
2 changes: 1 addition & 1 deletion 3.5/DockerfileJdk17
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ FROM tomcat:10.1.12-jdk17 AS runner

LABEL maintainer="Torsten Friebe <[email protected]>"

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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit a155fa9

Please sign in to comment.