From e8c62bcf3c0de5bfb5e229c33d9f548b3fd4d0b4 Mon Sep 17 00:00:00 2001
From: ramari16 <ramari16@gmail.com>
Date: Fri, 22 Sep 2023 14:11:39 -0400
Subject: [PATCH] [ALS-5052] Update to use docker tomcat image (#82)

---
 docker/pic-sure-hpds/Dockerfile | 13 ++--------
 war/pom.xml                     | 46 +++++----------------------------
 2 files changed, 8 insertions(+), 51 deletions(-)

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 @@
 	<build>
 		<pluginManagement>
 			<plugins>
-				<plugin>
-					<groupId>org.apache.tomcat.maven</groupId>
-					<artifactId>tomcat7-maven-plugin</artifactId>
-					<version>2.0</version>
-					<executions>
-						<execution>
-							<id>default-cli</id>
-							<goals>
-								<goal>run</goal>
-							</goals>
-							<configuration>
-								<port>13000</port>
-								<path>/jaxrs-service</path>
-								<useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-								<jpda>true</jpda>
-								<systemProperties>
-									<JAVA_OPTS>-Xms256m -Xmx512m</JAVA_OPTS>
-								</systemProperties>
-							</configuration>
-						</execution>
-					</executions>
-					<configuration>
-					</configuration>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
@@ -90,22 +66,12 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.tomcat.maven</groupId>
-				<artifactId>tomcat7-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>tomcat-run</id>
-						<goals>
-							<goal>exec-war-only</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<attachArtifact>true</attachArtifact>
-							<buildDirectory>../docker/pic-sure-hpds</buildDirectory>
-							<path>/</path>
-						</configuration>
-					</execution>
-				</executions>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>3.3.1</version>
+				<configuration>
+					<outputDirectory>docker/pic-sure-hpds</outputDirectory>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>