From 28c6c22a5997e99cadaa69eaef978ab2e626ab77 Mon Sep 17 00:00:00 2001
From: chumaedeogu <chumaedeogu@gmail.com>
Date: Fri, 21 Feb 2025 20:19:08 -0500
Subject: [PATCH 1/3] ty

---
 Dockerfile  | 22 +++++++++++++++++-----
 Dockerfile1 |  5 +++++
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 Dockerfile1

diff --git a/Dockerfile b/Dockerfile
index ceb6b0ab..69c76736 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,17 @@
-FROM tomcat 
-WORKDIR webapps 
-COPY target/WebApp.war .
-RUN rm -rf ROOT && mv WebApp.war ROOT.war
-ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"]
+FROM circleci/jdk8 as base
+WORKDIR /app
+COPY . .
+RUN RUN apt-get update && apt-get install -y maven
+RUN mvn clean package
+FROM tomcat:latest
+
+# Set working directory to Tomcat's webapps directory
+WORKDIR /usr/local/tomcat/webapps
+
+# Copy the WAR file to Tomcat's webapps directory
+COPY --from=base /app/target/*.war ./ROOT.war
+
+# Set correct entrypoint to keep Tomcat running in foreground
+
+EXPOSE 8080
+ENTRYPOINT ["catalina.sh", "run"]
\ No newline at end of file
diff --git a/Dockerfile1 b/Dockerfile1
new file mode 100644
index 00000000..9f3a5746
--- /dev/null
+++ b/Dockerfile1
@@ -0,0 +1,5 @@
+FROM tomcat:latest
+WORKDIR webapps 
+COPY target/WebApp.war .
+RUN rm -rf ROOT && mv WebApp.war ROOT.war
+ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"]

From 4ab704d3c8ca0a3e2d921f54a9b14e145b7f1b6b Mon Sep 17 00:00:00 2001
From: chumaedeogu <chumaedeogu@gmail.com>
Date: Fri, 21 Feb 2025 20:21:32 -0500
Subject: [PATCH 2/3] ty

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 69c76736..61e7a902 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM circleci/jdk8 as base
+FROM maven:3.8.6-openjdk-8 as base
 WORKDIR /app
 COPY . .
 RUN RUN apt-get update && apt-get install -y maven

From e274d16b122ea09cd030fa7af21ed187b00f9b98 Mon Sep 17 00:00:00 2001
From: chumaedeogu <chumaedeogu@gmail.com>
Date: Fri, 21 Feb 2025 20:42:53 -0500
Subject: [PATCH 3/3] modifications on Dockerfile

---
 Dockerfile | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 61e7a902..25b158c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,27 @@
-FROM maven:3.8.6-openjdk-8 as base
+# Use Maven with OpenJDK 8 as the build stage
+FROM maven:3.8.6-openjdk-8 AS base
+
 WORKDIR /app
+
+# Copy Maven project files
+COPY pom.xml .
+
+# Download dependencies to cache them
+RUN mvn dependency:go-offline
+
+# Copy application source code
 COPY . .
-RUN RUN apt-get update && apt-get install -y maven
+
+# Build the WAR file
 RUN mvn clean package
+
+# Use Tomcat as the final runtime image
 FROM tomcat:latest
 
-# Set working directory to Tomcat's webapps directory
 WORKDIR /usr/local/tomcat/webapps
 
-# Copy the WAR file to Tomcat's webapps directory
+# Copy the built WAR file to Tomcat's webapps directory
 COPY --from=base /app/target/*.war ./ROOT.war
 
-# Set correct entrypoint to keep Tomcat running in foreground
-
-EXPOSE 8080
-ENTRYPOINT ["catalina.sh", "run"]
\ No newline at end of file
+# Start Tomcat in the foreground
+ENTRYPOINT ["catalina.sh", "run"]