Modify Dockerfile to use Java 17 and Tomcat 10 and set docker.teameng…

…ine.version to 6.0-SNAPSHOT
opengeospatial · May 4, 2023 · d205a1c · d205a1c
1 parent 68601b5
commit d205a1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
   <properties>
     <ets-code>ogcapi-features-1.0</ets-code>
     <spec-version>1.0</spec-version>
-    <docker.teamengine.version>5.4.1</docker.teamengine.version>
+    <docker.teamengine.version>6.0-SNAPSHOT</docker.teamengine.version>
     <soapui.test.fail.ignore>false</soapui.test.fail.ignore>
     <soapui.teamengine.endpoint>http://localhost:8081/teamengine</soapui.teamengine.endpoint>
     <soapui.teamengine.user>ogctest</soapui.teamengine.user>

diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
@@ -1,8 +1,10 @@
-FROM tomcat:7.0-jre8
+FROM tomcat:10-jre17
 
 MAINTAINER Dirk Stenger <stenger@lat-lon.de>
 MAINTAINER Torsten Friebe <friebe@lat-lon.de>
 
+RUN apt update && apt install -y unzip
+
 # add TEAM engine webapp
 ADD maven/dependency/teamengine-web-*.war /root/
 RUN cd /root/ && unzip -q teamengine-web-*.war -d /usr/local/tomcat/webapps/teamengine
@@ -25,4 +27,4 @@ ADD maven/ets-ogcapi-features10-*-deps.zip /root/
 RUN cd /root/ && unzip -q -o ets-ogcapi-features10-*-deps.zip -d /usr/local/tomcat/webapps/teamengine/WEB-INF/lib
 
 # run tomcat
-CMD ["catalina.sh", "jpda", "run"]
+CMD ["catalina.sh", "jpda", "run"]