diff --git a/docker/pic-sure-hpds/Dockerfile b/docker/pic-sure-hpds/Dockerfile index 0b38a4de..1d1f395f 100644 --- a/docker/pic-sure-hpds/Dockerfile +++ b/docker/pic-sure-hpds/Dockerfile @@ -1,11 +1,2 @@ -FROM docker.io/alpine:3.16 - -RUN apk add --no-cache --purge -uU bash && rm -rf /var/cache/apk/* /tmp/* - -RUN apk add --no-cache --purge -uU curl wget unzip - -RUN apk add --no-cache --purge openjdk11 - -ADD hpds-war-1.0-SNAPSHOT-war-exec.jar /hpds.jar - -EXPOSE 8080 +FROM tomcat:9-jre11-openjdk-slim +ADD hpds-war-1.0-SNAPSHOT.war /usr/local/tomcat/webapps/ROOT.war \ No newline at end of file diff --git a/war/pom.xml b/war/pom.xml index e71e6efa..93c90038 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -20,30 +20,6 @@ - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.0 - - - default-cli - - run - - - 13000 - /jaxrs-service - true - true - - -Xms256m -Xmx512m - - - - - - - org.apache.maven.plugins maven-compiler-plugin @@ -90,22 +66,12 @@ - org.apache.tomcat.maven - tomcat7-maven-plugin - - - tomcat-run - - exec-war-only - - package - - true - ../docker/pic-sure-hpds - / - - - + org.apache.maven.plugins + maven-war-plugin + 3.3.1 + + docker/pic-sure-hpds +