From 69b1ecf1dddd32bff8d72214b56bf99aef62b57b Mon Sep 17 00:00:00 2001
From: Ryan Amari <ramari16@gmail.com>
Date: Thu, 16 Nov 2023 11:39:13 -0500
Subject: [PATCH] Update docker to use spring boot

---
 docker/pic-sure-hpds/Dockerfile | 11 +++++++++--
 service/pom.xml                 | 13 +++++++++++++
 war/pom.xml                     | 34 ---------------------------------
 3 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/docker/pic-sure-hpds/Dockerfile b/docker/pic-sure-hpds/Dockerfile
index d1e32b75..d6b12b47 100644
--- a/docker/pic-sure-hpds/Dockerfile
+++ b/docker/pic-sure-hpds/Dockerfile
@@ -1,2 +1,9 @@
-FROM tomcat:9-jre11-openjdk-slim
-ADD hpds-war-2.0.0-SNAPSHOT.war /usr/local/tomcat/webapps/ROOT.war
\ No newline at end of file
+FROM amazoncorretto:21.0.1-alpine3.18
+
+# Copy jar and access token from maven build
+ADD service-3.0.0-SNAPSHOT.jar /service.jar
+
+# Time zone
+ENV TZ="US/Eastern"
+
+ENTRYPOINT ["java", "-Xmx8192m", "-jar", "/service.jar"]
\ No newline at end of file
diff --git a/service/pom.xml b/service/pom.xml
index 8467508c..833e0b73 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -73,4 +73,17 @@
 
 	</dependencies>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.3.0</version>
+				<configuration>
+					<outputDirectory>../docker/pic-sure-hpds</outputDirectory>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>
diff --git a/war/pom.xml b/war/pom.xml
index 5628668b..deda5e51 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -40,39 +40,5 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
-		<plugins>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>default-clean</id>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-						<configuration>
-							<filesets>
-								<fileset>
-									<directory>../docker/pic-sure-hpds</directory>
-									<includes>
-										<include>*.war</include>
-										<include>*.jar</include>
-										<include>war-exec.*</include>
-									</includes>
-								</fileset>
-							</filesets>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<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>
 </project>