From 14099d7fa399e982e961f9d96da7f441e61b6250 Mon Sep 17 00:00:00 2001 From: sai Date: Mon, 9 May 2022 06:09:32 +0000 Subject: [PATCH 1/7] sai changed java code --- webapp/src/main/webapp/index.jsp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 846b5e3b..e2b3e9ce 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -5,3 +5,5 @@

We are done with DevOps Project-2

We are done with Docker Deployment!!

Thanks for watching DevOps-2 project !!

+

thanks you hari for you devpps class

+ From 104e8c43a12237770b00481fea9215ed412866d2 Mon Sep 17 00:00:00 2001 From: sai Date: Mon, 16 May 2022 18:14:40 +0000 Subject: [PATCH 2/7] Dockerfile update --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e0bc2f55..80b05d7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Pull base image -From tomcat:8-jre8 +From tomcat:latest # Maintainer MAINTAINER "valaxytech@gmail.com" -COPY ./webapp.war /usr/local/tomcat/webapps -RUN cp -R /usr/local/tomcat/webapps.dist/* /usr/local/tomcat/webapps +COPY ./webapp/target/*.war /usr/local/tomcat/webapps/ +RUN cp -R /usr/local/tomcat/webapps.dist/* /usr/local/tomcat/webapps/ From b9bce02e02d07b6dc4e74d60caba1078c9558f3a Mon Sep 17 00:00:00 2001 From: SaiRevanth-J <65378029+SaiRevanth-J@users.noreply.github.com> Date: Tue, 17 May 2022 15:37:31 +0530 Subject: [PATCH 3/7] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 80b05d7c..503c8d53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,4 +4,4 @@ From tomcat:latest # Maintainer MAINTAINER "valaxytech@gmail.com" COPY ./webapp/target/*.war /usr/local/tomcat/webapps/ -RUN cp -R /usr/local/tomcat/webapps.dist/* /usr/local/tomcat/webapps/ + From c09d2b199ff4773cc43bedad0b39a1b4cbfc0450 Mon Sep 17 00:00:00 2001 From: EC2 Default User Date: Wed, 18 May 2022 03:56:35 +0000 Subject: [PATCH 4/7] docker up --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 503c8d53..ad85e266 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,4 +4,4 @@ From tomcat:latest # Maintainer MAINTAINER "valaxytech@gmail.com" COPY ./webapp/target/*.war /usr/local/tomcat/webapps/ - +CMD /usr/local/tomcat/bin/./startup.sh From 32144a9eb9236ed39c239495f7028b5aac0eedbc Mon Sep 17 00:00:00 2001 From: SaiRevanth-J <65378029+SaiRevanth-J@users.noreply.github.com> Date: Sun, 5 Jun 2022 16:02:11 +0530 Subject: [PATCH 5/7] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ad85e266..411d587b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,4 +4,4 @@ From tomcat:latest # Maintainer MAINTAINER "valaxytech@gmail.com" COPY ./webapp/target/*.war /usr/local/tomcat/webapps/ -CMD /usr/local/tomcat/bin/./startup.sh +CMD ["catalina.sh","run"] From 21488ad72e5de67b1263a1d4a1e5bf1c8bbc2a2d Mon Sep 17 00:00:00 2001 From: SaiRevanth-J <65378029+SaiRevanth-J@users.noreply.github.com> Date: Mon, 6 Jun 2022 10:22:55 +0530 Subject: [PATCH 6/7] new code --- webapp/src/main/webapp/index.jsp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index e2b3e9ce..c3045924 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,9 +1,4 @@ -

Hello Dear Students !!, Welcome to DevOps Project-2 !!

-

By Mr.Hari from Saidemy

-

It's time to start the DevOps Project-2!! Get ready!!!

-

This is what complete End-to-End CI-CD Pipeline DevOps Project !!

-

We are done with DevOps Project-2

+

HellO INVIZ !!, Welcome to Demo !!

+

By J.SAI REVANTH KUMAR

We are done with Docker Deployment!!

-

Thanks for watching DevOps-2 project !!

-

thanks you hari for you devpps class

- +

Thanks for watching Demo!!

From 7633bb3d80a37ed5492a51a38f3088caeb8a7da2 Mon Sep 17 00:00:00 2001 From: SaiRevanth-J <65378029+SaiRevanth-J@users.noreply.github.com> Date: Mon, 27 Jun 2022 11:35:35 +0530 Subject: [PATCH 7/7] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eccd2068..bbf00735 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.8 + 1.8