From b449f09aa52b65fa4860a06d59ec2bbbf868630b Mon Sep 17 00:00:00 2001
From: Likith2919 <72124258+Likith2919@users.noreply.github.com>
Date: Fri, 9 Jul 2021 12:52:34 +0530
Subject: [PATCH 1/8] Update pom.xml

---
 pom.xml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9e1759e..3379dd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,3 +28,35 @@
   </repository>
 </distributionManagement>
 </project>
+<build>
+		<plugins>
+
+			<plugin><!-- don't pack the war  -->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-war</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
+						<id>war-exploded</id>
+						<configuration>
+							<webappDirectory>target/deploy</webappDirectory>
+							<archiveClasses>true</archiveClasses>
+						</configuration>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>exploded</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

From 659edd1c020e50338a86d411ed69d9e29a2ebc50 Mon Sep 17 00:00:00 2001
From: Likith2919 <72124258+Likith2919@users.noreply.github.com>
Date: Tue, 27 Jul 2021 17:11:19 +0530
Subject: [PATCH 2/8] Add files via upload

---
 Dockerfile.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Dockerfile.txt

diff --git a/Dockerfile.txt b/Dockerfile.txt
new file mode 100644
index 0000000..2679b1d
--- /dev/null
+++ b/Dockerfile.txt
@@ -0,0 +1,9 @@
+FROM centos:7
+COPY ..
+WORKDIR /JavaWeb
+RUN yum -y install maven
+RUN mvn package
+RUN yum -y install wget
+RUN wget https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.94/bin/apache-tomcat-7.0.94.tar.gz
+RUN xvf tar apache-tomcat-7.0.94.tar.gz
+RUN mv /JavaWeb/target/WebAppCal-0.0.6.war apache-tomcat-7.0.94/webapps

From 75e321367f5e6dc5af1401df486271dd7c749dc2 Mon Sep 17 00:00:00 2001
From: Likith2919 <likith.siri@gmail.com>
Date: Tue, 27 Jul 2021 11:54:59 +0000
Subject: [PATCH 3/8] ndjfkanfd

---
 Dockerfile | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..f19cb6c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM centos
+RUN yum -y install git
+RUN git clone https://github.com/Likith2919/JavaWeb.git
+WORKDIR /JavaWeb
+RUN yum -y install maven
+RUN mvn package
+ADD https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.94/bin/apache-tomcat-7.0.94.tar.gz .
+RUN tar xvf apache-tomcat-7.0.94.tar.gz
+COPY home/centos/JavaWeb/target/WebAppCal-0.0.6.war /usr/local/tomcat/webapps
+EXPOSE 8080

From 1b1d924609bc850aca4d01e19944d315032e63c8 Mon Sep 17 00:00:00 2001
From: Likith2919 <72124258+Likith2919@users.noreply.github.com>
Date: Tue, 27 Jul 2021 17:32:40 +0530
Subject: [PATCH 4/8] Delete Dockerfile.txt

---
 Dockerfile.txt | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 Dockerfile.txt

diff --git a/Dockerfile.txt b/Dockerfile.txt
deleted file mode 100644
index 2679b1d..0000000
--- a/Dockerfile.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM centos:7
-COPY ..
-WORKDIR /JavaWeb
-RUN yum -y install maven
-RUN mvn package
-RUN yum -y install wget
-RUN wget https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.94/bin/apache-tomcat-7.0.94.tar.gz
-RUN xvf tar apache-tomcat-7.0.94.tar.gz
-RUN mv /JavaWeb/target/WebAppCal-0.0.6.war apache-tomcat-7.0.94/webapps

From 4c1b9f092ff0627cbae68d3773ec28d4ee94077d Mon Sep 17 00:00:00 2001
From: Likith2919 <72124258+Likith2919@users.noreply.github.com>
Date: Tue, 27 Jul 2021 17:59:57 +0530
Subject: [PATCH 5/8] Update pom.xml

Edited by me
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3379dd2..505705d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.web.cal</groupId>
   <artifactId>WebAppCal</artifactId>
   <packaging>war</packaging>
-  <version>0.0.6</version>
+  <version>0.0.7</version>
   <name>WebAppCal Maven Webapp</name>
   <url>http://maven.apache.org</url>
   <dependencies>

From 503ade97321d821347f92f44b5fc924295cfe71d Mon Sep 17 00:00:00 2001
From: Likith2919 <72124258+Likith2919@users.noreply.github.com>
Date: Tue, 27 Jul 2021 18:06:49 +0530
Subject: [PATCH 6/8] Update pom.xml

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 505705d..245f17c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
         <url>http://52.204.135.48:8081/nexus/content/repositories/releases</url>
   </repository>
 </distributionManagement>
-</project>
 <build>
 		<plugins>
 

From f1dcca2274402d31b86aa409f449bb5521ccc967 Mon Sep 17 00:00:00 2001
From: deepakjammu <88040046+deepakjammu@users.noreply.github.com>
Date: Tue, 27 Jul 2021 18:43:42 +0530
Subject: [PATCH 7/8] Update Dockerfile

---
 Dockerfile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f19cb6c..f3580b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
-FROM centos
-RUN yum -y install git
-RUN git clone https://github.com/Likith2919/JavaWeb.git
-WORKDIR /JavaWeb
+FROM centos:7 as junk
+RUN yum install java-1.8.0 -y
+RUN yum install git -y
 RUN yum -y install maven
+RUN git clone https://github.com/ravi2krishna/JavaWeb.git
+#RUN echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" > /etc/apt/sources.list
+WORKDIR /JavaWeb
 RUN mvn package
-ADD https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.94/bin/apache-tomcat-7.0.94.tar.gz .
-RUN tar xvf apache-tomcat-7.0.94.tar.gz
-COPY home/centos/JavaWeb/target/WebAppCal-0.0.6.war /usr/local/tomcat/webapps
+FROM tomcat
+COPY --from=junk /JavaWeb/target/WebAppCal-0.0.6.war /usr/local/tomcat/webapps
 EXPOSE 8080

From 2efedfb570f3ddac51dabf5322064f30c84e07e2 Mon Sep 17 00:00:00 2001
From: deepakjammu <88040046+deepakjammu@users.noreply.github.com>
Date: Tue, 27 Jul 2021 18:47:13 +0530
Subject: [PATCH 8/8] Update Dockerfile

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f3580b6..f54afd8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,9 @@ FROM centos:7 as junk
 RUN yum install java-1.8.0 -y
 RUN yum install git -y
 RUN yum -y install maven
-RUN git clone https://github.com/ravi2krishna/JavaWeb.git
-#RUN echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" > /etc/apt/sources.list
 WORKDIR /JavaWeb
+COPY . .
 RUN mvn package
 FROM tomcat
-COPY --from=junk /JavaWeb/target/WebAppCal-0.0.6.war /usr/local/tomcat/webapps
+COPY --from=junk /JavaWeb/target/*.war /usr/local/tomcat/webapps
 EXPOSE 8080