updated to 3.4.34

tfr42 · Aug 2, 2023 · 009dcb8 · 009dcb8
1 parent 792dad9
commit 009dcb8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -45,7 +45,7 @@ jobs:
         context: ./3.4
         platforms: linux/amd64,linux/arm64
         push: true
-        tags: tfr42/deegree:3.4.33,tfr42/deegree:3.4
+        tags: tfr42/deegree:3.4.34,tfr42/deegree:3.4
   build-3_5:
     runs-on: ubuntu-latest
     steps:

diff --git a/3.4/Dockerfile b/3.4/Dockerfile
@@ -7,7 +7,7 @@ FROM tomcat:8.5-jdk8
 LABEL maintainer="Torsten Friebe <[email protected]>"
 
 # set deegree version
-ENV DEEGREE_VERSION=3.4.33
+ENV DEEGREE_VERSION=3.4.34
 ENV CATALINA_OPTS="-Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl"
 
 EXPOSE 8080

diff --git a/3.5/Dockerfile b/3.5/Dockerfile
@@ -13,12 +13,13 @@ ARG DEEGREE_VERSION=3.5.0
 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/
-EXPOSE 8080
 
+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
-RUN curl https://repo.deegree.org/content/repositories/public/org/deegree/deegree-webservices-handbook/${DEEGREE_VERSION}/deegree-webservices-handbook-${DEEGREE_VERSION}-html.zip -o /tmp/handbook.zip
-RUN unzip /tmp/handbook.zip -d /usr/local/tomcat/webapps/ROOT/
+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 && \
+    curl https://repo.deegree.org/content/repositories/public/org/deegree/deegree-webservices-handbook/${DEEGREE_VERSION}/deegree-webservices-handbook-${DEEGREE_VERSION}-html.zip -o /tmp/handbook.zip && \
+    unzip /tmp/handbook.zip -d /usr/local/tomcat/webapps/ROOT/
+
+EXPOSE 8080
 # run tomcat
 CMD ["catalina.sh", "run"]
diff --git a/3.5/README.md b/3.5/README.md
@@ -12,13 +12,17 @@ To build a docker image run:
 
 To run a container use:
 
-    % docker run -p 8080:8080 -d deegree/deegree:3.5.0
-    % docker run -d --name deegree35 -p 8082:8080 tfr42/deegree:3.5
+    % docker run -p 8080:8080 -d tfr42/deegree:3.5.0
+    % docker run --name deegree35 -p 8082:8080 -d tfr42/deegree:3.5
 
 ## Access
 
 Enter the address into a browser: http://localhost:8080/deegree-webservices or run:
 
     % open http://$IP:8080/deegree-webservices
 
-where $IP is the IP address of host.
+where $IP is the IP address of host.
+
+## Documentation
+
+The documentation is accessible at http://localhost:8082/deegree-webservices-handbook-3.5.0/index.html