From 60f375fc9efd40d2a66f03b9eb989b536d6af7de Mon Sep 17 00:00:00 2001
From: Torsten Friebe <torsten.friebe@gmail.com>
Date: Sat, 26 Aug 2023 00:40:44 +0200
Subject: [PATCH] publish 3.5.2 and experimental image with jdk17

---
 .github/workflows/docker-image.yml | 21 ++++++++++++++++++++-
 3.5/Dockerfile                     |  2 +-
 3.5/DockerfileJdk17                | 30 ++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 3.5/DockerfileJdk17

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 378dbf5..ac11df1 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -63,4 +63,23 @@ jobs:
         context: ./3.5
         platforms: linux/amd64,linux/arm64
         push: true
-        tags: tfr42/deegree:3.5.1,tfr42/deegree:3.5,tfr42/deegree:latest
\ No newline at end of file
+        tags: tfr42/deegree:3.5.2,tfr42/deegree:3.5,tfr42/deegree:latest
+  build-3_5_jdk17:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push v3.5 with JDK 17
+        uses: docker/build-push-action@v4
+        with:
+          context: ./3.5
+          file: 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
diff --git a/3.5/Dockerfile b/3.5/Dockerfile
index ca98dc4..2f5649b 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 <tfr@users.sourceforge.net>"
 
 # set deegree version
-ARG DEEGREE_VERSION=3.5.1
+ARG DEEGREE_VERSION=3.5.2
 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
new file mode 100644
index 0000000..4cd86c9
--- /dev/null
+++ b/3.5/DockerfileJdk17
@@ -0,0 +1,30 @@
+## tfr42/deegree:3.5-jdk17
+#
+# This file is available under the following license:
+# under LGPL 2.1 (LICENSE.TXT) Copyright 2020 Torsten Friebe <tfr@users.sourceforge.net>
+FROM maven:3.9.3-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
+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
+
+LABEL maintainer="Torsten Friebe <tfr@users.sourceforge.net>"
+
+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"
+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
+# run tomcat
+CMD ["catalina.sh", "run"]