Publish 3.5.5 release version

.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.4,tfr42/deegree:3.5,tfr42/deegree:latest
+        tags: tfr42/deegree:3.5.5,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.4-jdk17-tomcat10,tfr42/deegree:3.5-jdk17-tomcat10,tfr42/deegree:3.5-jdk17
+          tags: tfr42/deegree:3.5.5-jdk17-tomcat10,tfr42/deegree:3.5-jdk17-tomcat10,tfr42/deegree:3.5-jdk17

3.5/Dockerfile

@@ -9,11 +9,10 @@ RUN apt-get update && apt-get -yq install zip
 LABEL maintainer="Torsten Friebe <[email protected]>"
 
 # set deegree version
-ARG DEEGREE_VERSION=3.5.4
+ARG DEEGREE_VERSION=3.5.5
 ENV DEEGREE_WORKSPACE_ROOT=/root/.deegree
 ENV CATALINA_OPTS="-Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Dlog.dir=$CATALINA_HOME/logs"
 
-
 WORKDIR /usr/local/tomcat/webapps/
 # download deegree war file
 RUN curl https://repo.deegree.org/content/repositories/public/org/deegree/deegree-webservices/${DEEGREE_VERSION}/deegree-webservices-${DEEGREE_VERSION}.war -o /usr/local/tomcat/webapps/deegree-webservices.war && \

3.5/DockerfileJdk17

@@ -2,29 +2,37 @@
 #
 # This file is available under the following license:
 # under LGPL 2.1 (LICENSE.TXT) Copyright 2020 Torsten Friebe <[email protected]>
-FROM maven:3.9.3-eclipse-temurin-17 AS builder
+FROM maven:3.9.5-eclipse-temurin-17 AS builder
 
 RUN apt-get update && apt-get -yq install git openssl
 
 ARG REPO_URL=https://repo.deegree.org
-ARG DEEGREE_VERSION=3.5.2
+ARG DEEGREE_VERSION=3.5.5
 WORKDIR /build_deegree/
 RUN mkdir -p /build_deegree
 RUN cd /build_deegree
 RUN curl -o deegree-webservices-${DEEGREE_VERSION}.war $REPO_URL/content/repositories/public/org/deegree/deegree-webservices/${DEEGREE_VERSION}/deegree-webservices-${DEEGREE_VERSION}.war
 RUN curl -o jakartaee-migration-1.0.7-shaded.jar https://dlcdn.apache.org/tomcat/jakartaee-migration/v1.0.7/binaries/jakartaee-migration-1.0.7-shaded.jar
 RUN java -jar jakartaee-migration-1.0.7-shaded.jar $PWD/deegree-webservices-${DEEGREE_VERSION}.war $PWD/deegree-webservices.war
 
-FROM tomcat:10.1.12-jdk17 AS runner
+FROM tomcat:10.1.16-jdk17 AS runner
 
 LABEL maintainer="Torsten Friebe <[email protected]>"
 
 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
+# API key to use; if empty will not change API key
+ENV DEEGREE_API_KEY=
+ENV DEEGREE_CONSOLE_PW=
+
 VOLUME $DEEGREE_WORKSPACE_ROOT
 WORKDIR /usr/local/tomcat/webapps/
 # copy deegree war file from builder
 COPY --from=builder /build_deegree/deegree-webservices.war /usr/local/tomcat/webapps/deegree-webservices.war
+
+WORKDIR $DEEGREE_WORKSPACE_ROOT
+# apply API key
+RUN ([ -z "$DEEGREE_API_KEY" ] || (echo $DEEGREE_API_KEY > $DEEGREE_WORKSPACE_ROOT/config.apikey))
 # run tomcat
 CMD ["catalina.sh", "run"]