From 165fb342d61c998c3ed3c472d93d645f48d919ef Mon Sep 17 00:00:00 2001 From: kaleem Date: Thu, 10 Oct 2024 17:29:49 +0000 Subject: [PATCH 001/100] kaleem commit --- webapp/src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index c22c57f7..05cd173a 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,2 +1,3 @@

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

By Mr. Sai from Saidemy!!

+

This is CI/CD Project from kaleem for practice

From 7e83b1bf8d70acb3215ab81d55daad6038c366ae Mon Sep 17 00:00:00 2001 From: kaleem Date: Thu, 10 Oct 2024 17:45:07 +0000 Subject: [PATCH 002/100] new message final --- webapp/src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 05cd173a..d9505b45 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,3 +1,4 @@

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

By Mr. Sai from Saidemy!!

This is CI/CD Project from kaleem for practice

+

This is final CI/CD Project from kaleem for practice

From 4c28978ed8bafa7bae934dab29433c49f769f708 Mon Sep 17 00:00:00 2001 From: kaleem Date: Fri, 11 Oct 2024 07:24:46 +0000 Subject: [PATCH 003/100] correction --- 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 d9505b45..3c7e43bb 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -2,3 +2,5 @@

By Mr. Sai from Saidemy!!

This is CI/CD Project from kaleem for practice

This is final CI/CD Project from kaleem for practice

+

final correction

+ From 4df641f2a764baee634072dc8d8e21aeec245071 Mon Sep 17 00:00:00 2001 From: kaleem Date: Fri, 11 Oct 2024 07:29:13 +0000 Subject: [PATCH 004/100] correct1 --- webapp/src/main/webapp/index.jsp | 1 - 1 file changed, 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 3c7e43bb..064ed80b 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -2,5 +2,4 @@

By Mr. Sai from Saidemy!!

This is CI/CD Project from kaleem for practice

This is final CI/CD Project from kaleem for practice

-

final correction

From 5e190289528d5f50a4982b2336e470d827499146 Mon Sep 17 00:00:00 2001 From: kaleem Date: Fri, 11 Oct 2024 07:34:48 +0000 Subject: [PATCH 005/100] correct2 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 064ed80b..9c901a21 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -2,4 +2,4 @@

By Mr. Sai from Saidemy!!

This is CI/CD Project from kaleem for practice

This is final CI/CD Project from kaleem for practice

- +

cicd final

From 846b72808cc9e4db7900566fbe5ad991aea982c2 Mon Sep 17 00:00:00 2001 From: kaleem Date: Fri, 11 Oct 2024 07:40:03 +0000 Subject: [PATCH 006/100] correct2 --- webapp/src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 9c901a21..70c34466 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -3,3 +3,4 @@

This is CI/CD Project from kaleem for practice

This is final CI/CD Project from kaleem for practice

cicd final

+

Ammaar Hafsa project

From 67245e6d50a84719adac7834a4a22cfa02e95ad6 Mon Sep 17 00:00:00 2001 From: kaleem Date: Mon, 14 Oct 2024 09:54:25 +0000 Subject: [PATCH 007/100] ansible cicd --- 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 70c34466..65da2565 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,3 +4,5 @@

This is final CI/CD Project from kaleem for practice

cicd final

Ammaar Hafsa project

+

Ansible CI/CD project

+ From a74cb184e1ed8dbab63b439629e170f407a2256e Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 3 Feb 2025 04:00:02 +0000 Subject: [PATCH 008/100] pom maven version modified --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eccd2068..75588968 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 3.4.0 + 3.4.0 From d1bb8a74ba04d21eb37a9b744f5f8a95da5e9f05 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 3 Feb 2025 04:26:46 +0000 Subject: [PATCH 009/100] pom modified --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 75588968..ed6d4595 100644 --- a/pom.xml +++ b/pom.xml @@ -158,6 +158,12 @@ jetty-maven-plugin 8.0.0.M1 + + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + From 6e882e80d0c1917b86307dfdda6c42ce00cdfc80 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 3 Feb 2025 18:06:41 +0000 Subject: [PATCH 010/100] Updated pom.xml with Java 17 support --- Dockerfile | 8 +++--- README.md | 0 pom.xml | 25 ++++++++++++------ server/pom.xml | 0 server/src/main/java/com/example/Greeter.java | 0 server/src/site/apt/index.apt | 0 .../test/java/com/example/TestGreeter.java | 0 webapp.war | Bin 0 -> 2050 bytes webapp/pom.xml | 0 webapp/src/main/webapp/WEB-INF/web.xml | 0 webapp/src/main/webapp/index.jsp | 0 11 files changed, 21 insertions(+), 12 deletions(-) mode change 100644 => 100755 Dockerfile mode change 100644 => 100755 README.md mode change 100644 => 100755 pom.xml mode change 100644 => 100755 server/pom.xml mode change 100644 => 100755 server/src/main/java/com/example/Greeter.java mode change 100644 => 100755 server/src/site/apt/index.apt mode change 100644 => 100755 server/src/test/java/com/example/TestGreeter.java create mode 100644 webapp.war mode change 100644 => 100755 webapp/pom.xml mode change 100644 => 100755 webapp/src/main/webapp/WEB-INF/web.xml mode change 100644 => 100755 webapp/src/main/webapp/index.jsp diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 index 5877a4af..1133e7c4 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Pull base image -From tomcat:8-jre8 +From tomcat:9.0.8-jre8 # Maintainer -MAINTAINER "sai4cs@gmail.com" -COPY ./webapp.war /usr/local/tomcat/webapps -RUN cp -R /usr/local/tomcat/webapps.dist/* /usr/local/tomcat/webapps +MAINTAINER "Mohammad Kaleem" +COPY ./webapp.war usr/local/tomcat/webapps + diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index ed6d4595..0168f525 --- a/pom.xml +++ b/pom.xml @@ -33,9 +33,10 @@ maven-compiler-plugin + 3.8.1 - 3.4.0 - 3.4.0 + 11 + 11 @@ -106,11 +107,6 @@ 2.3 - - maven-pmd-plugin - 2.6 - - maven-project-info-reports-plugin 2.4 @@ -222,5 +218,18 @@ 3.0.3 - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + 17 + + + + diff --git a/server/pom.xml b/server/pom.xml old mode 100644 new mode 100755 diff --git a/server/src/main/java/com/example/Greeter.java b/server/src/main/java/com/example/Greeter.java old mode 100644 new mode 100755 diff --git a/server/src/site/apt/index.apt b/server/src/site/apt/index.apt old mode 100644 new mode 100755 diff --git a/server/src/test/java/com/example/TestGreeter.java b/server/src/test/java/com/example/TestGreeter.java old mode 100644 new mode 100755 diff --git a/webapp.war b/webapp.war new file mode 100644 index 0000000000000000000000000000000000000000..f76df239854123f1fb13f3ad9b0d5f38d3cfc6b4 GIT binary patch literal 2050 zcmWIWW@h1HVBlb2XjFENVn70%K(?=Ih@-BjpPPOFP?-o&83$OIv)r4j0YK?MAO?ye zl=(XPdAhj83%jEgfM^Bj;KrX=UP@vlx z!d;!N207+GHPGWI!YB7?p^!uEmoaS#?wFIcjkdc7_nnd^3)`~irk#JlMd!LD~KF>|4+2fIw5wJ z&aq3Er^)WRyscz=+bi!v_(xpUdB<9NwJPnz=*2uy-<>!=fLX z)KsK5>`SV>zxm(1nct3FR*C%BKmBfYprdl;+KZmCIt6Qt=d7|0_AuXCX>7Oe|1B;b)0wMTM-MvIqBz(HB!GV z3w`=nL3*{q^X@7R5icdK`=-q|Pybtx{<-7x{X^3C*VUiD zIdsLKGw6S|p0n6Rb42yP&q+a~88YIk^IX8it)P33W)+0R-It^Ktt=-b<0FXr3}h;r`k zYG5mLxio|MuHC)M(LocEWT(!)cgpi_sqD*pEO%co+OaVH-TShA8{1;EUORBcq_6(? zxmQ|xRe3Liy7X7^={Ifyh#YnvsCK4fi z>}F*KXCv!1c4lNX*&^W;q;XYsw95J*LvGc5bt~6vyWrbjfJZ> zFW+FZw@2jj%Y{DdAJf%JlkdpsJ!v@?E7l$%r=0PrWRk&`=iMyg>&5ye_OdOv?+(id zQPons*!Lp%osq9}r{4u9f1O#|4n6IjnXKl^7xiz_`7Sr*?{V8U9hr1dLj6{DQ+=|M z`s)8Dp1%Hn-lThR@x4bs^eVnFBT@sXP`oo|+b&OFDga?SGE)OEffS?`m1L$Cd+TVO z^zru5`{=V#*WcGmN8^E){waN3hN8)zi@yeG3l(!01$`|NJ{|PAguCn0=Ag;mJ5B|4 zcNu^FoWuK-r=40Dt1ALkvw0+EqPgc*Bb2P(cGK!D+`BZvi0!Vqn^%W|kbh9!;a z$l8!fc6=6t%3=rrS-cX+M3l_9oeL_PApoT7Jdg>~g(#^(x*@K{R#wCGFKPS>WWq~s zWY2=Mp_hvYZ6|=)9cC%CltkBzUMe6ovoj+FFll83vL)CO8^RJ%R`M)CB)tG{RyL4% Q96)FUtQmFzO=MsI02dq9s{jB1 literal 0 HcmV?d00001 diff --git a/webapp/pom.xml b/webapp/pom.xml old mode 100644 new mode 100755 diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml old mode 100644 new mode 100755 diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp old mode 100644 new mode 100755 From f623e69db536514c366c0784b65b7e542b5fbe76 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 3 Feb 2025 18:22:18 +0000 Subject: [PATCH 011/100] pom.xml with Java 17 support --- pom.xml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 0168f525..4cd0c926 100755 --- a/pom.xml +++ b/pom.xml @@ -91,8 +91,17 @@ maven-checkstyle-plugin 2.8 - + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + 17 + + + maven-compiler-plugin 2.3.2 @@ -219,17 +228,4 @@ 3.0.3 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 17 - 17 - - - - - + From 2e2d6d9a18aa92d3d07128866fc0babdc26ee19a Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 3 Feb 2025 18:28:50 +0000 Subject: [PATCH 012/100] modified pom.xml with Java 17 support --- pom.xml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 4cd0c926..89e5f507 100755 --- a/pom.xml +++ b/pom.xml @@ -35,8 +35,8 @@ maven-compiler-plugin 3.8.1 - 11 - 11 + 17 + 17 @@ -92,20 +92,6 @@ 2.8 - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 17 - 17 - - - - maven-compiler-plugin - 2.3.2 - - maven-javadoc-plugin 2.8 From d1aac4c6321fb5e4b9d0d304f320260c91cb6095 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 4 Feb 2025 10:28:34 +0000 Subject: [PATCH 013/100] index modified --- Dockerfile.save | 7 +++++++ webapp/src/main/webapp/index.jsp | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 Dockerfile.save diff --git a/Dockerfile.save b/Dockerfile.save new file mode 100644 index 00000000..c189a95e --- /dev/null +++ b/Dockerfile.save @@ -0,0 +1,7 @@ +qw# Pull base image +From tomcat:9.0.8-jre8 + +# Maintainer +MAINTAINER "Mohammad Kaleem" +COPY ./webapp.war /tomcat9/webapps + diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 65da2565..ae494b41 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -3,6 +3,6 @@

This is CI/CD Project from kaleem for practice

This is final CI/CD Project from kaleem for practice

cicd final

-

Ammaar Hafsa project

-

Ansible CI/CD project

+

first step for Argocd project

+ From 04a89ad71f8175225c93cb7a6306211e9553a236 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 4 Feb 2025 10:37:11 +0000 Subject: [PATCH 014/100] updated --- Dockerfile.save | 7 ------- webapp/src/main/webapp/index.jsp | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 Dockerfile.save diff --git a/Dockerfile.save b/Dockerfile.save deleted file mode 100644 index c189a95e..00000000 --- a/Dockerfile.save +++ /dev/null @@ -1,7 +0,0 @@ -qw# Pull base image -From tomcat:9.0.8-jre8 - -# Maintainer -MAINTAINER "Mohammad Kaleem" -COPY ./webapp.war /tomcat9/webapps - diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index ae494b41..6af29e83 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,5 +4,5 @@

This is final CI/CD Project from kaleem for practice

cicd final

first step for Argocd project

- +

test step for Argocd project

From be371e919f726dccc9a95411c92008989e9e17bd Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 4 Feb 2025 11:05:51 +0000 Subject: [PATCH 015/100] webapp.war removed --- webapp.war | Bin 2050 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 webapp.war diff --git a/webapp.war b/webapp.war deleted file mode 100644 index f76df239854123f1fb13f3ad9b0d5f38d3cfc6b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2050 zcmWIWW@h1HVBlb2XjFENVn70%K(?=Ih@-BjpPPOFP?-o&83$OIv)r4j0YK?MAO?ye zl=(XPdAhj83%jEgfM^Bj;KrX=UP@vlx z!d;!N207+GHPGWI!YB7?p^!uEmoaS#?wFIcjkdc7_nnd^3)`~irk#JlMd!LD~KF>|4+2fIw5wJ z&aq3Er^)WRyscz=+bi!v_(xpUdB<9NwJPnz=*2uy-<>!=fLX z)KsK5>`SV>zxm(1nct3FR*C%BKmBfYprdl;+KZmCIt6Qt=d7|0_AuXCX>7Oe|1B;b)0wMTM-MvIqBz(HB!GV z3w`=nL3*{q^X@7R5icdK`=-q|Pybtx{<-7x{X^3C*VUiD zIdsLKGw6S|p0n6Rb42yP&q+a~88YIk^IX8it)P33W)+0R-It^Ktt=-b<0FXr3}h;r`k zYG5mLxio|MuHC)M(LocEWT(!)cgpi_sqD*pEO%co+OaVH-TShA8{1;EUORBcq_6(? zxmQ|xRe3Liy7X7^={Ifyh#YnvsCK4fi z>}F*KXCv!1c4lNX*&^W;q;XYsw95J*LvGc5bt~6vyWrbjfJZ> zFW+FZw@2jj%Y{DdAJf%JlkdpsJ!v@?E7l$%r=0PrWRk&`=iMyg>&5ye_OdOv?+(id zQPons*!Lp%osq9}r{4u9f1O#|4n6IjnXKl^7xiz_`7Sr*?{V8U9hr1dLj6{DQ+=|M z`s)8Dp1%Hn-lThR@x4bs^eVnFBT@sXP`oo|+b&OFDga?SGE)OEffS?`m1L$Cd+TVO z^zru5`{=V#*WcGmN8^E){waN3hN8)zi@yeG3l(!01$`|NJ{|PAguCn0=Ag;mJ5B|4 zcNu^FoWuK-r=40Dt1ALkvw0+EqPgc*Bb2P(cGK!D+`BZvi0!Vqn^%W|kbh9!;a z$l8!fc6=6t%3=rrS-cX+M3l_9oeL_PApoT7Jdg>~g(#^(x*@K{R#wCGFKPS>WWq~s zWY2=Mp_hvYZ6|=)9cC%CltkBzUMe6ovoj+FFll83vL)CO8^RJ%R`M)CB)tG{RyL4% Q96)FUtQmFzO=MsI02dq9s{jB1 From 0c1bfbeeee226b73d2c83d6ed25f2f27c441bcd7 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 4 Feb 2025 12:38:31 +0000 Subject: [PATCH 016/100] docker modified --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1133e7c4..6737fe16 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,5 +3,10 @@ From tomcat:9.0.8-jre8 # Maintainer MAINTAINER "Mohammad Kaleem" -COPY ./webapp.war usr/local/tomcat/webapps +RUN docker stop tomcontainer && docker rm tomcontainer && docker rmi dockaleem/tomcat-app:latest +RUN /home/vagrant/SaiJavaCode +RUN docker build -t dockaleem/tomcat-app:latest . +RUN docker run -itd --name tomcontainer -p 8080:9000 dockaleem/tomcat-app:latest + +#COPY ./webapp.war usr/local/tomcat/webapps From f58b23d9ef32d8f57b2adc27bb00d447f5503b94 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 4 Feb 2025 15:54:05 +0000 Subject: [PATCH 017/100] Dockerfile modified --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6737fe16..d76f5666 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,6 @@ From tomcat:9.0.8-jre8 # Maintainer MAINTAINER "Mohammad Kaleem" -RUN docker stop tomcontainer && docker rm tomcontainer && docker rmi dockaleem/tomcat-app:latest -RUN /home/vagrant/SaiJavaCode RUN docker build -t dockaleem/tomcat-app:latest . RUN docker run -itd --name tomcontainer -p 8080:9000 dockaleem/tomcat-app:latest From 30f4569b4b09a5d18d53a1e279cf34c90a4f09eb Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 4 Feb 2025 15:59:56 +0000 Subject: [PATCH 018/100] Dockerfile modified1 --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d76f5666..b419e53c 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,6 @@ From tomcat:9.0.8-jre8 # Maintainer MAINTAINER "Mohammad Kaleem" -RUN docker build -t dockaleem/tomcat-app:latest . RUN docker run -itd --name tomcontainer -p 8080:9000 dockaleem/tomcat-app:latest #COPY ./webapp.war usr/local/tomcat/webapps From 9e65cc43be80c12abcf8fd43be73cb9fff571137 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 4 Feb 2025 17:08:34 +0000 Subject: [PATCH 019/100] dockerfile modified2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b419e53c..1f795da1 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ From tomcat:9.0.8-jre8 # Maintainer MAINTAINER "Mohammad Kaleem" -RUN docker run -itd --name tomcontainer -p 8080:9000 dockaleem/tomcat-app:latest +RUN sudo -u vagrant docker run -itd --name tomcontainer -p 8080:9000 dockaleem/tomcat-app:latest #COPY ./webapp.war usr/local/tomcat/webapps From 0cbc4c0f4a7a79493208788ce686c64d17cd1a53 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 4 Feb 2025 17:21:28 +0000 Subject: [PATCH 020/100] dockerfile modified3 --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f795da1..71a51386 100755 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,7 @@ From tomcat:9.0.8-jre8 # Maintainer -MAINTAINER "Mohammad Kaleem" -RUN sudo -u vagrant docker run -itd --name tomcontainer -p 8080:9000 dockaleem/tomcat-app:latest - -#COPY ./webapp.war usr/local/tomcat/webapps +LABEL MAINTAINER "Mohammad Kaleem" +COPY ./webapp.war usr/local/tomcat/webapps +EXPOSE 8080 From fd2a330a80a5775ea02105bfc0cb24147501224a Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 4 Feb 2025 17:23:05 +0000 Subject: [PATCH 021/100] dockerfile modified4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 71a51386..1f405e93 100755 --- a/Dockerfile +++ b/Dockerfile @@ -4,5 +4,5 @@ From tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" COPY ./webapp.war usr/local/tomcat/webapps -EXPOSE 8080 +EXPOSE 9000 From be34ca7fe1f4f088731e5952f4102be676f5b0d1 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 5 Feb 2025 06:18:12 +0000 Subject: [PATCH 022/100] dockerfile test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1f405e93..007b4914 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,6 @@ From tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY ./webapp.war usr/local/tomcat/webapps +#COPY /usr/local/tomcat/webapp.war usr/local/tomcat/webapps EXPOSE 9000 From 871abed10211b64f2fe67c03d08575dee9537b4a Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 06:39:12 +0000 Subject: [PATCH 023/100] dockerfile test1 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 007b4914..68a28f27 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # Pull base image -From tomcat:9.0.8-jre8 +FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -#COPY /usr/local/tomcat/webapp.war usr/local/tomcat/webapps +COPY /var/lib/jenkins/workspace/first-pipe/webapp.war usr/local/tomcat/webapps EXPOSE 9000 From 37edc658bb7264fdeeb11896f99a29d238998be3 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 11:55:17 +0000 Subject: [PATCH 024/100] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8196d201..ff1946dd 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # maven-project - +# Test Simple Maven Project From e0046a696dcea24e6b2388df2eb275cb3b0a1b48 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 12:34:45 +0000 Subject: [PATCH 025/100] Dockerfile new --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68a28f27..d25bdaac 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,6 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /var/lib/jenkins/workspace/first-pipe/webapp.war usr/local/tomcat/webapps -EXPOSE 9000 +COPY /var/lib/jenkins/workspace/new-pipe/webapp.war usr/local/tomcat/webapps + From e77b835fa5d73e3db23815867859e3c1b6616161 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 12:44:26 +0000 Subject: [PATCH 026/100] modified --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d25bdaac..e1d059b9 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,6 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /var/lib/jenkins/workspace/new-pipe/webapp.war usr/local/tomcat/webapps +COPY /var/lib/jenkins/workspace/new-pipeline/webapp.war usr/local/tomcat/webapps From 7eb638aa5ec35cbfedd51ffcc8c3800ae5a4dc1b Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 12:52:39 +0000 Subject: [PATCH 027/100] modified1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e1d059b9..82cc9bba 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,6 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /var/lib/jenkins/workspace/new-pipeline/webapp.war usr/local/tomcat/webapps +COPY /var/lib/jenkins/workspace/new-pipeline/webapp.war opt/tomcat/webapps From dc315ca0f42822ee79add0222f15929f9d5c5183 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 14:07:51 +0000 Subject: [PATCH 028/100] dockerfile changed --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 82cc9bba..5402f814 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /var/lib/jenkins/workspace/new-pipeline/webapp.war opt/tomcat/webapps +COPY /target/webapp.war opt/tomcat/webapps +EXPOSE 9000 +CMD ['catalina.sh', 'run'] From a6cf645f94e527ba8038eb04a8f56948e45f1c84 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 14:11:38 +0000 Subject: [PATCH 029/100] dockerfile changed1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5402f814..30e149a3 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /target/webapp.war opt/tomcat/webapps +COPY /var/lib/jenkins/workspace/new-pipeline/webapp/target/webapp.war opt/tomcat/webapps EXPOSE 9000 CMD ['catalina.sh', 'run'] From 1b60a667d4e53f3d852a1c51997c231ee3177475 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 14:26:14 +0000 Subject: [PATCH 030/100] change --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 30e149a3..c1921183 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /var/lib/jenkins/workspace/new-pipeline/webapp/target/webapp.war opt/tomcat/webapps +COPY ./webapp.war opt/tomcat/webapps EXPOSE 9000 -CMD ['catalina.sh', 'run'] +CMD ["catalina.sh", "run"] From e65ee4da8b326faf257865e4db668db9034bf5d3 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 15:18:13 +0000 Subject: [PATCH 031/100] message --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 6af29e83..334af0f6 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,5 +4,5 @@

This is final CI/CD Project from kaleem for practice

cicd final

first step for Argocd project

-

test step for Argocd project

+

test step for Argocd project!!!!

From 85356d54c443f90b03f8ace7290cf9de1f52d9fa Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 15:31:37 +0000 Subject: [PATCH 032/100] change11 --- Dockerfile | 2 +- webapp.war | Bin 0 -> 2051 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 webapp.war diff --git a/Dockerfile b/Dockerfile index c1921183..b092fc55 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY ./webapp.war opt/tomcat/webapps +COPY /root/SaiJavaCode/webapp.war opt/tomcat/webapps EXPOSE 9000 CMD ["catalina.sh", "run"] diff --git a/webapp.war b/webapp.war new file mode 100644 index 0000000000000000000000000000000000000000..c176847d4d43539646ec7c90ef91873045df5495 GIT binary patch literal 2051 zcmWIWW@h1HVBlb2;H!3xVn70%K(?=Ih@-BjpPPOFP?-o&83$OIv)r4j0YK?MAO?ye zl=(XPdAhj83%jEgfM^Bj;KrX=UP@vlx z!d;!N207+GHPGWI!YB7?pQmb5}#CkWBF9oV{Wn^Fgc|J2QCAC5?tGHll&q1z3 z20U%=tGnJXmhAW}@uKWPvxd)ym|bT=Z*N@^c;oi%$X3}e2`3bv{NK0#MYw8CU^cfY zS5w=2UA{M$Mb52QYRX~b+TZ-SK&9ICWVg){SFtloUVIiZQ+|`l*&A?SqUq&}izJn& z>|YqX-lk=3S!8JaETwv3sf!NjoHCpzy&j2g3~s*g|8>wwvt66hm!B}MaQlAgTFJ)7 zqK&1;4F4UwWFY7}4-rG2iLOy`LVG6&0sWD|#K6FhB)y8QxzVrOi+ww$-JzIqXViuR&C?aEWH9lN)-&{^ww&at1%->4kkoYtDTL%*H;OqG^U2Z2Z_)1wA7|eme2hRt&iDjvI`pNmZdZ`tO zxdl0?dSDUVf};Ga)Z`LI=_KF&%LW2%?|+Jh9yKi!`xYYUeaGQe zznANQT+`CD=;=o`=9qi7{&;V(ZF26Rc84cs#_!MAR37)4{jBBC+F!eZzP0KN~b&jMQ6U zA`#NZZdPV+HnLu0XGT_&?Uh|lLd(^=C1h1MGWJY9uQ117rzCu;M(*Wn(m_vlx0m0( z`}=r*Pv6ZIh7pzKQFofGi=0+`lew4Wmfp%ZyYJ4;Ig1Y4X6%i5|39dvwK;_SUZdo! z;{_U8D<;dul|4H>FfXJO}ZBs-+S~!ui_gsA~k?Y#XEDh?eYYs0uZ(%Gc^DcNI_~*NoH!X zw~p3HA8#MMk3Ji9{e8W3G#+^ApVHT5D4P7a_-l~1P%(E=(AOg2(?Oq0xVt`W4w~$} z<5W<0m+|M%IlNzaN}B)5FgMx$aozze5gD08n6a03pz;d>1Q^~rf>`h*4AF+WFo)`6 zSkkDDtPQDX$7eC9Fopn-#VdhKMA3}fxuC)s0zkUX1DP;gh@u*#8{%qgg*8n7+s3~@ zCcNlI_AIt?5uxoQFuTJng_e@&n$b%Igk}zAqyQ$Zj6k*oTVjJ*vZPUrl{`xjNiV>g Tl?`Mb2M`(oYlhuG6B!r)^)=XE literal 0 HcmV?d00001 From 2ab6f4cedea5454164becb340170121bfc23213b Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 15:38:08 +0000 Subject: [PATCH 033/100] change12 --- Dockerfile | 2 +- webapp.war | Bin 2051 -> 2051 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b092fc55..e6467b4e 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /root/SaiJavaCode/webapp.war opt/tomcat/webapps +COPY /SaiJavaCode/webapp.war opt/tomcat/webapps EXPOSE 9000 CMD ["catalina.sh", "run"] diff --git a/webapp.war b/webapp.war index c176847d4d43539646ec7c90ef91873045df5495..f1c2ea9bf9644ed3bc29f3f864419877b2d8ee95 100644 GIT binary patch delta 81 zcmZn`XcpiJ@MdP=VqoB4VBo2l$fL>xB#j$DxB#j$D Date: Wed, 5 Feb 2025 15:41:57 +0000 Subject: [PATCH 034/100] change13 --- webapp.war | Bin 2051 -> 2051 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/webapp.war b/webapp.war index f1c2ea9bf9644ed3bc29f3f864419877b2d8ee95..3a2fa5c88aaaa297af874bee192c8a76795e02f4 100644 GIT binary patch delta 80 zcmZn`XcpiO@MdP=VqoB4V0b-|TaEGcM59K=*OMLDgeM*sVtl>vmKzI@tH`Dbimc0k Date: Wed, 5 Feb 2025 15:50:28 +0000 Subject: [PATCH 035/100] change14 --- Dockerfile | 2 +- webapp.war | Bin 2051 -> 2051 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e6467b4e..e0d9f565 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /SaiJavaCode/webapp.war opt/tomcat/webapps +COPY webapp.war opt/tomcat/webapps EXPOSE 9000 CMD ["catalina.sh", "run"] diff --git a/webapp.war b/webapp.war index 3a2fa5c88aaaa297af874bee192c8a76795e02f4..baaf7b5af763ef6f2892986142597f7086fde7ba 100644 GIT binary patch delta 81 zcmZn`XcpiJ@MdP=VqoB4V92hW$fL>xB#j$D~AZq$aUB VfH+QUCO~R)1)C@%h}+Lz0su|59RvUX From 87f0c72c24f61167b90e860227598bece10edac1 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 16:04:13 +0000 Subject: [PATCH 036/100] change15 --- Dockerfile | 2 +- webapp.war | Bin 2051 -> 2051 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e0d9f565..c1921183 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY webapp.war opt/tomcat/webapps +COPY ./webapp.war opt/tomcat/webapps EXPOSE 9000 CMD ["catalina.sh", "run"] diff --git a/webapp.war b/webapp.war index baaf7b5af763ef6f2892986142597f7086fde7ba..c1ea77d467441dc330f160df7cb8d2bddca66cd7 100644 GIT binary patch delta 81 zcmZn`XcpiJ@MdP=VqoB4VBo8t$fL>xB#j$DxB#j$D Date: Wed, 5 Feb 2025 16:13:09 +0000 Subject: [PATCH 037/100] change16 --- Dockerfile | 2 +- webapp.war | Bin 2051 -> 2051 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c1921183..6cb5ef6e 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY ./webapp.war opt/tomcat/webapps +COPY ./webapp.war /opt/tomcat/webapps EXPOSE 9000 CMD ["catalina.sh", "run"] diff --git a/webapp.war b/webapp.war index c1ea77d467441dc330f160df7cb8d2bddca66cd7..00a70580095e12c29468525277d0cbc990be840d 100644 GIT binary patch delta 81 zcmZn`XcpiJ@MdP=VqoB4U|8KSkw=vYNE$bQ$gL_sa^r1R79cfQiFGN6I>~AZq$aUB VfH+QUCO~R)1)C@%h}+Lz0s!`k8ms^S delta 81 zcmZn`XcpiJ@MdP=VqoB4VBo8t$fL>xB#j$D Date: Wed, 5 Feb 2025 17:38:21 +0000 Subject: [PATCH 038/100] change16 --- Dockerfile | 2 +- webapp.war | Bin 2051 -> 2051 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6cb5ef6e..3fc7a0c1 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY ./webapp.war /opt/tomcat/webapps +COPY webapp.war /opt/tomcat/webapps/ EXPOSE 9000 CMD ["catalina.sh", "run"] diff --git a/webapp.war b/webapp.war index 00a70580095e12c29468525277d0cbc990be840d..5b825cf40381d7cf1171a40c25e3e43eb7dd8651 100644 GIT binary patch delta 81 zcmZn`XcpiJ@MdP=VqoB4U^vw{kw=vYNE$bQ$gL_sa^r1R79cfQiFGN6I>~AZq$aUB VfH+QUCO~R)1)C@%h}+Lz0stiM8|(l8 delta 81 zcmZn`XcpiJ@MdP=VqoB4U|8KSkw=vYNE$bQ$gL_sa^r1R79cfQiFGN6I>~AZq$aUB VfH+QUCO~R)1)C@%h}+Lz0s!`k8ms^S From b87c509adeba263023ed1c2d59304ec336236cb9 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 17:41:57 +0000 Subject: [PATCH 039/100] indexfile changed --- webapp.war | Bin 2051 -> 2051 bytes webapp/src/main/webapp/index.jsp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp.war b/webapp.war index 5b825cf40381d7cf1171a40c25e3e43eb7dd8651..b0d7dcc4e232aa22db1bd40b4b42e6750f8ce9cf 100644 GIT binary patch delta 81 zcmZn`XcpiJ@MdP=VqoB4V0hazkw=vYNE$bQ$gL_sa^r1R79cfQiFGN6I>~AZq$aUB VfH+QUCO~R)1)C@%h}+Lz0sv<#9k>7h delta 81 zcmZn`XcpiJ@MdP=VqoB4U^vw{kw=vYNE$bQ$gL_sa^r1R79cfQiFGN6I>~AZq$aUB VfH+QUCO~R)1)C@%h}+Lz0stiM8|(l8 diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 334af0f6..faaae017 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,5 +4,5 @@

This is final CI/CD Project from kaleem for practice

cicd final

first step for Argocd project

-

test step for Argocd project!!!!

+

second step for Argocd project!!!!

From e179874f3a495992a58aa347509197eb919e8f7e Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 17:56:14 +0000 Subject: [PATCH 040/100] changed20 --- Dockerfile | 2 +- webapp.war | Bin 2051 -> 2054 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3fc7a0c1..f1425241 100755 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,6 @@ FROM tomcat:9.0.8-jre8 LABEL MAINTAINER "Mohammad Kaleem" COPY webapp.war /opt/tomcat/webapps/ EXPOSE 9000 -CMD ["catalina.sh", "run"] +CMD rm -rf /usr/local/tomcat/webapps/ROOT && catalina.sh run diff --git a/webapp.war b/webapp.war index b0d7dcc4e232aa22db1bd40b4b42e6750f8ce9cf..9cc38a62579b381fbac54fbbff3f7acd0f30c0b0 100644 GIT binary patch delta 329 zcmZn`XcOQG@MdP=VqoB4V94&B$fL>xB#j$D*ELEm;6V5a1_lOqMg|5> zAf1_)l3JmcRa`K&XCv1k1A(^hc1OQ5Zn?2jWQ%NxKr7cd#ho`YF12`z{Q9=cZDBK? zoVm>R`up);S4(YMv9(o9(oy^!Q~QI@GUrz8H04O_l4F1V(BoT|jn1hVVXh{dSLtWp z=-IGbwZx}UC3~5x^8!iXkbMh-*V`P)EpxqGH%q8KS?XfL7M4B<{;tR3fvXx{{x4m( z!{gl>P0^nWb_=RAvv=L_*m=e3u}zV6M|^^u`oWvRn@=)^GXp&|S&4Nih&st?3Zy2n zIe<7$Y$hP8g3Xo(*|U=mvUxC`nass*!^F)zc`duy6|j0C%qntZwzj}@c(tt zNwZy>)0dwxu5kN)=~~Ig#-fd-#|-}+yJR5fJ8$zD#&Bk!ZzijnM9aHfZ@df3@_KHJ9D<} a@&pD52-^WM3@m9Bo4lSqkZm_BNCW`9L5!XN From 9b1a2e5438d77f86c3f3a0c600f2d3b404018a1a Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 5 Feb 2025 18:09:01 +0000 Subject: [PATCH 041/100] changed 21 --- Dockerfile | 2 +- webapp.war | Bin 2054 -> 2054 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f1425241..1b589c90 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY webapp.war /opt/tomcat/webapps/ +COPY webapp.war /opt/tomcat/webapps/ROOT.war EXPOSE 9000 CMD rm -rf /usr/local/tomcat/webapps/ROOT && catalina.sh run diff --git a/webapp.war b/webapp.war index 9cc38a62579b381fbac54fbbff3f7acd0f30c0b0..f461db76fed355f4f062590ccd5da7a688a5fad6 100644 GIT binary patch delta 82 zcmZn@XcOQG@MdP=VqoB4V9@TL$fL@n(?8L;feFaossbc8-u7StQj=9#mx8D>tfoK( ZlbP8ZKs;AA6Cky@noX1u#GS-m0sv-a7GMAX delta 82 zcmZn@XcOQG@MdP=VqoB4V94&B$fL>xB#j$D Date: Thu, 6 Feb 2025 04:30:04 +0000 Subject: [PATCH 042/100] change22 --- webapp.war | Bin 2054 -> 2054 bytes webapp/src/main/webapp/index.jsp | 6 ++---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/webapp.war b/webapp.war index f461db76fed355f4f062590ccd5da7a688a5fad6..4d5cb4d766289488704fa8c4e5608ae6770825bc 100644 GIT binary patch delta 82 zcmZn@XcOQG@MdP=VqoB4VDOnZkw=vYNE$bQ$gL_sa^r0e79cfQm31kII>TxTqL|qn VK$I(+36R=c%_hnS;!a{O0RWk&7rX!f delta 82 zcmZn@XcOQG@MdP=VqoB4V9@TL$fL@n(?8L;feFaossbc8-u7StQj=9#mx8D>tfoK( ZlbP8ZKs;AA6Cky@noX1u#GS-m0sv-a7GMAX diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index faaae017..f2c56921 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,8 +1,6 @@ -

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

-

By Mr. Sai from Saidemy!!

+

Hello! Welcome to DevOps Project-2!!

This is CI/CD Project from kaleem for practice

This is final CI/CD Project from kaleem for practice

-

cicd final

first step for Argocd project

-

second step for Argocd project!!!!

+ From 8352c4cfa4cb2f22135283caec4135f285df34c7 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 6 Feb 2025 06:30:45 +0000 Subject: [PATCH 043/100] changed25 --- Dockerfile | 2 +- webapp.war | Bin 2054 -> 2011 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1b589c90..a13b9eed 100755 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,6 @@ FROM tomcat:9.0.8-jre8 LABEL MAINTAINER "Mohammad Kaleem" COPY webapp.war /opt/tomcat/webapps/ROOT.war EXPOSE 9000 -CMD rm -rf /usr/local/tomcat/webapps/ROOT && catalina.sh run +CMD rm -rf /opt/tomcat/webapps/ROOT.war && catalina.sh run diff --git a/webapp.war b/webapp.war index 4d5cb4d766289488704fa8c4e5608ae6770825bc..8bb2e2c27de81433ccfd87af4bd3726bb4dcb296 100644 GIT binary patch delta 334 zcmZn@xXsTS;LXg!#lXP9!0p`E{BC4;4pEZ>uL7reL+S{>=_e0FC8r``UCM~?Z; z`1Jeuv9}$zPtQn+pPDD`lzirk)wHh3ALiEFmROtE?l-kJ?TF>Fu6-{Jd_IdSa_Cp= z@Y$lUVL``d-O5+e3x9GtSMB;!FE{B*+pQIAlGM$=UFW;r+#mdkck>y>aAuG@C#$h8 z0n=w$O~5n@n?0CzV>1TRHEh;=s2-Vol+B%S;bdNR8>RQz{mQuI#!itfvLynoT;~*b-pIJr;w|#)+cLL> z&3tm^GT-a($A4WdwQa@LRxwFO@pnw^4?fGBTd~uWBe6@4{rN+WZ(TMzr)Gq?nrvRB zpM9fe!*bOUpGK8zw`I-?B!xrvEeu|7b0oLS^>W=Tq55R0iw#>?`Xu zblnb*cW*RBe=^uDsLssZb;D!l6|2WKMb;hh33BQOZwhZ-$QaHH^3vqrEK9)jB32VH zeUsH5OiQyFgXusvYd%yzPoBl*&Uj|>BQ_f*Zsy4f?5+wxbE59d*|y6Q7#1LG2gES2 Yq*0O;sK{)x11s0$qwE4~`&dCz0BB@}@Bjb+ From 3569d40b951f9f80dae6f59ca903ef6b557e9671 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 6 Feb 2025 06:58:48 +0000 Subject: [PATCH 044/100] change26 --- webapp.war | Bin 2011 -> 2011 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/webapp.war b/webapp.war index 8bb2e2c27de81433ccfd87af4bd3726bb4dcb296..075b224c7a969acaaab1bdee172ee47a8ddbbf5a 100644 GIT binary patch delta 82 zcmcc3f195tz?+$ci-CcIfq~m(B9AH)kTh-pky}-O^TpAZgqHBDbml$&I&VS%B2!Uo1;O)IwHM5Ossq V0Ypi$nE?Z#8&LoN From aaa05f89700625a9d4eab084a3f4d3629cab24ed Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 6 Feb 2025 07:08:09 +0000 Subject: [PATCH 045/100] changed27 --- Dockerfile | 2 +- webapp.war | Bin 2011 -> 2011 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a13b9eed..d593dd48 100755 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,6 @@ FROM tomcat:9.0.8-jre8 LABEL MAINTAINER "Mohammad Kaleem" COPY webapp.war /opt/tomcat/webapps/ROOT.war EXPOSE 9000 -CMD rm -rf /opt/tomcat/webapps/ROOT.war && catalina.sh run +#CMD rm -rf /opt/tomcat/webapps/ROOT.war && catalina.sh run diff --git a/webapp.war b/webapp.war index 075b224c7a969acaaab1bdee172ee47a8ddbbf5a..9f49e911811a8c7999cb10c9fe10327c0463b493 100644 GIT binary patch delta 82 zcmcc3f195tz?+$ci-CcIfq~azB9AH)kTh-pky}-O Date: Thu, 6 Feb 2025 07:38:55 +0000 Subject: [PATCH 046/100] changed28 --- Dockerfile | 2 +- webapp.war | Bin 2011 -> 2011 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d593dd48..f7f80c40 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY webapp.war /opt/tomcat/webapps/ROOT.war +COPY webapp.war /opt/tomcat/webapps/ EXPOSE 9000 #CMD rm -rf /opt/tomcat/webapps/ROOT.war && catalina.sh run diff --git a/webapp.war b/webapp.war index 9f49e911811a8c7999cb10c9fe10327c0463b493..adf6ab4713b1805dfd9dc1113f0c901c8998b0c4 100644 GIT binary patch delta 82 zcmcc3f195tz?+$ci-CcIfuX}@B9AH)kTh-pky}-O Date: Thu, 6 Feb 2025 07:43:04 +0000 Subject: [PATCH 047/100] changed30 --- webapp.war | Bin 2011 -> 2011 bytes webapp/src/main/webapp/index.jsp | 1 + 2 files changed, 1 insertion(+) diff --git a/webapp.war b/webapp.war index adf6ab4713b1805dfd9dc1113f0c901c8998b0c4..9624c72459d499115823f23d8793f86b926f44be 100644 GIT binary patch delta 82 zcmcc3f195tz?+$ci-CcIfq~0*B9AH)kTh-pky}-O This is CI/CD Project from kaleem for practice

This is final CI/CD Project from kaleem for practice

first step for Argocd project

+

Second step for Argocd project

From 64d6981ebeda5a1deb151902014e8cf97a3f70eb Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 6 Feb 2025 07:50:27 +0000 Subject: [PATCH 048/100] changed 31 --- Dockerfile | 2 +- webapp.war | Bin 2011 -> 2018 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7f80c40..88570a7d 100755 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,6 @@ FROM tomcat:9.0.8-jre8 LABEL MAINTAINER "Mohammad Kaleem" COPY webapp.war /opt/tomcat/webapps/ EXPOSE 9000 -#CMD rm -rf /opt/tomcat/webapps/ROOT.war && catalina.sh run +CMD rm -rf /opt/tomcat/webapps/*.war && catalina.sh run diff --git a/webapp.war b/webapp.war index 9624c72459d499115823f23d8793f86b926f44be..122f3388f8071aa8b25ffe41796f097c4b156c5f 100644 GIT binary patch delta 314 zcmcc3|A?PEz?+$ci-CcIfuU<6w;E&DM59I^u|*X~+|sRYwRMYP-hOCW3j+hgZy@Fb z;>^61)C#?<;)1DXHgX*@5NUn5*T3)+L(mx+u1kDYni>}EUyivJHKMIyq0e1iru$yrgRLy-JO{{`k(V}lPhmKVhrlV`GdFs_*Vh|Pxa`DA%^H-#>sAMecB kw#yUfHxRZ1Vi;J`_?2a{0=wB{2Uf1hN7)6~X0d{#0Gh^j$p8QV delta 283 zcmaFFf195>z?+$ci-CcIfq`oxw;ChYM59I^u|*X~+|sRosq7Xtquwa5mVtrc5)g9& zab{jhYK2}_alzCx8@ZSa1zH~3`5RU;So+BFJz00bi~FF}k>1W{cQ$a^?SFXWnBR;~ zzmFe#+hP0kjFkAPdE!pVXTDfX>ze#wZq03pwTbP1Q+v~nST5_@_tL=Uv$!IMe#H)- zEeabJbbQvWd?mf`C#Q4Ou0Qp1ldiPgTCpZc-Td2izU$5X!LN8XuV4&kX5^a0x{Q%) z@^V%)AbF3~5lAYqnF7f$Hd|g4*H2!+=E1md@=G=wrUy)u1zF7|$FlPS73Q+bGQDE~ R3OGzY!!E!!nHA_o1_10^Y3%?2 From 7e7c0241f65cc363be6f08546b6bc815945357ac Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 6 Feb 2025 08:35:15 +0000 Subject: [PATCH 049/100] changed32 --- Dockerfile | 3 ++- webapp.war | Bin 2018 -> 2018 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 88570a7d..ab6a0eeb 100755 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ FROM tomcat:9.0.8-jre8 LABEL MAINTAINER "Mohammad Kaleem" COPY webapp.war /opt/tomcat/webapps/ EXPOSE 9000 -CMD rm -rf /opt/tomcat/webapps/*.war && catalina.sh run +CMD rm -rf /opt/tomcat/webapps/*.war +CMD ["catalina.sh", "run"] diff --git a/webapp.war b/webapp.war index 122f3388f8071aa8b25ffe41796f097c4b156c5f..1a5ae1bda85bf2d2dd76e6068eb5edc4e3c16766 100644 GIT binary patch delta 82 zcmaFF|A?O_z?+$ci-CcIfg#&&B9AH)kTh-pky}-O Date: Thu, 6 Feb 2025 09:39:58 +0000 Subject: [PATCH 050/100] changed34 --- webapp.war | Bin 2018 -> 2018 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/webapp.war b/webapp.war index 1a5ae1bda85bf2d2dd76e6068eb5edc4e3c16766..2f012c72b1ce048ab7fb26e63ab1fb2ced4e5cb0 100644 GIT binary patch delta 82 zcmaFF|A?O_z?+$ci-CcIfuYA`B9AH)kTh;!>UNp9RRu_Hysg3lq$V@6E(OX=UcqV# ZqVBUgfCLrUOn}tpa5hm!5I2v#1OUS57wrH5 delta 82 zcmaFF|A?O_z?+$ci-CcIfg#&&B9AH)kTh-pky}-O Date: Thu, 6 Feb 2025 10:32:40 +0000 Subject: [PATCH 051/100] changed35 --- webapp.war | Bin 2018 -> 2018 bytes webapp/src/main/webapp/index.jsp | 2 -- 2 files changed, 2 deletions(-) diff --git a/webapp.war b/webapp.war index 2f012c72b1ce048ab7fb26e63ab1fb2ced4e5cb0..e6917eccac437e3b225b441ae7aa3b4efd50be31 100644 GIT binary patch delta 82 zcmaFF|A?O_z?+$ci-CcIfkE4MB9AH)kTh-pky}-OUNp9RRu_Hysg3lq$V@6E(OX=UcqV# ZqVBUgfCLrUOn}tpa5hm!5I2v#1OUS57wrH5 diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index e6f0cf69..87f04775 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -2,6 +2,4 @@

This is CI/CD Project from kaleem for practice

This is final CI/CD Project from kaleem for practice

first step for Argocd project

-

Second step for Argocd project

- From 08d9cc297beac2cc21bf41098049a0a020216872 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 6 Feb 2025 10:37:59 +0000 Subject: [PATCH 052/100] change40 --- webapp.war | Bin 2018 -> 2010 bytes webapp/src/main/webapp/index.jsp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp.war b/webapp.war index e6917eccac437e3b225b441ae7aa3b4efd50be31..32eb7915086ba474f37d69cc4c5012fbb93df22f 100644 GIT binary patch delta 293 zcmaFFe~X_dz?+$ci-CcIfx$CmB9AH)kTh-pky}+jQUCw| delta 323 zcmcb`|A?O_z?+$ci-CcIfkE4MB9AH)kTh-pky}+jnH6kbr&E0zw;|b%WLVDuGoDWXG+KL+ufPTqyIVoMydYh1&ra$ zK-W(G$+8qgEnqbTQP)`=K$Ik#35fD%v*AVY%H$br9*ip{KV-9Ed_Gx@-AzH;*DdPK moNc>2fgS{5J0OOEC5>NMCd;#%O}1y{ntX&^fNd5lND2V+pmo#$ diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 87f04775..eaa15ce6 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -2,4 +2,4 @@

This is CI/CD Project from kaleem for practice

This is final CI/CD Project from kaleem for practice

first step for Argocd project

- +

Argocd project

From 82abf9edd8597370a6647378944493a31bac1f72 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 6 Feb 2025 10:54:51 +0000 Subject: [PATCH 053/100] change 50 --- webapp.war | Bin 2010 -> 2013 bytes webapp/src/main/webapp/index.jsp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp.war b/webapp.war index 32eb7915086ba474f37d69cc4c5012fbb93df22f..01763da4dc21a1586cf0c0845d125956cde9a43a 100644 GIT binary patch delta 318 zcmcb`f0v&pz?+$ci-CcIf#FE#L>^TpAZgqHBDbo5$lE&gPeR}C||!8r8#5a<*A%iM>LOg)m^Te@yxtQ{M?S) zE>j*x1{~QXCM)|jpuW}4F6Wp1_rNUY+z_#iQ?++{x1Vn2|DIjJxOo9%I5W_plYg=- z1yKuFO+nOkRtFFz$z}qg{Ml@HQG79Z2Ac=t;>i!$Y#1L+mScBQI1=g>b!X1DU7kR{ gfv_DA!@!cp4=j`A+07=~vvN&7!Y;rzl@%lf05FVo9smFU delta 296 zcmcc1e~X_dz?+$ci-CcIfx$CmB9AH)kTh-pky}+j This is CI/CD Project from kaleem for practice

This is final CI/CD Project from kaleem for practice

first step for Argocd project

-

Argocd project

+

second step Argocd project

From 2314367991face2b5e6d0486b1bb0d1a010fd64a Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 6 Feb 2025 10:59:42 +0000 Subject: [PATCH 054/100] change 51 --- webapp/src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 56684c98..d66c60dc 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -3,3 +3,4 @@

This is final CI/CD Project from kaleem for practice

first step for Argocd project

second step Argocd project

+

final step Argocd project

From 59a6c41240db7cd8bbff8222f8990d264bf88e7d Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Fri, 7 Feb 2025 09:57:29 +0000 Subject: [PATCH 055/100] k8s-1 --- webapp/src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index d66c60dc..cdcc4ca4 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,3 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

+

intigrating to k8s cluster

From 54a53fab0f1f4218f896c3b725b8490077cf67f8 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Sat, 8 Feb 2025 11:40:03 +0000 Subject: [PATCH 056/100] k8s --- Dockerfile | 4 ++-- webapp/src/main/webapp/index.jsp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab6a0eeb..5a40f67b 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,9 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY webapp.war /opt/tomcat/webapps/ +COPY webapp.war /usr/local/tomcat/webapps/ EXPOSE 9000 -CMD rm -rf /opt/tomcat/webapps/*.war +CMD rm -rf /usr/local/tomcat/webapps/*.war CMD ["catalina.sh", "run"] diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index cdcc4ca4..13fd8f16 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster

+

intigrating to k8s cluster first step

From c5681895f99e67e12aeddbc78d003ad6f5542dbd Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Sat, 8 Feb 2025 14:24:25 +0000 Subject: [PATCH 057/100] k8s2 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 13fd8f16..80cbd5cf 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step

+

intigrating to k8s cluster first step1

From b96183dcd0305323f3d95209aa13f962c9f8b285 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Sat, 8 Feb 2025 14:51:53 +0000 Subject: [PATCH 058/100] k8s3 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 80cbd5cf..23d173f5 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step1

+

intigrating to k8s cluster first step2

From 9f60eb2a825eb7c0bfb1ffb9a3e301881d5d937d Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Sat, 8 Feb 2025 16:02:39 +0000 Subject: [PATCH 059/100] k8s4 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 23d173f5..5d878487 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step2

+

intigrating to k8s cluster first step3

From 332442e69541a6bd2507c1e27f152fe846b8ef89 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Sat, 8 Feb 2025 16:28:25 +0000 Subject: [PATCH 060/100] k8s5 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 5d878487..31b3ff8b 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step3

+

intigrating to k8s cluster first step4

From e414e56f81fe883ca89a18398f8cd4fc18fa5677 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Sat, 8 Feb 2025 16:30:40 +0000 Subject: [PATCH 061/100] k8s6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5a40f67b..91823a59 100755 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" COPY webapp.war /usr/local/tomcat/webapps/ -EXPOSE 9000 +EXPOSE 8080 CMD rm -rf /usr/local/tomcat/webapps/*.war CMD ["catalina.sh", "run"] From 76b2e4cb990ea03a0f9e6d49b999f8572ac4d190 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 11 Feb 2025 14:22:59 +0000 Subject: [PATCH 062/100] new change --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 31b3ff8b..67620dec 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step4

+

intigrating to k8s cluster first step5

From 1bf501f98bc4726b025e9cf65cdf311905b7ea6f Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 11 Feb 2025 15:19:30 +0000 Subject: [PATCH 063/100] change --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 67620dec..1e470aff 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step5

+

intigrating to k8s cluster first step6

From afc724de754cfad0b8380ec0620f4d2261afcbd1 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Tue, 11 Feb 2025 15:40:11 +0000 Subject: [PATCH 064/100] change1 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 1e470aff..b34c0b03 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step6

+

intigrating to k8s cluster first step7

From 351e277bfd7edb9a2589577a8fa0a2412022a26f Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 12 Feb 2025 09:44:22 +0000 Subject: [PATCH 065/100] change2 --- webapp.war | Bin 2013 -> 0 bytes webapp/src/main/webapp/index.jsp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 webapp.war diff --git a/webapp.war b/webapp.war deleted file mode 100644 index 01763da4dc21a1586cf0c0845d125956cde9a43a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2013 zcmWIWW@h1HVBlb2I1=g>#ef7jfoxyb5Jz24KR5jVpfVAlG7hjZXSp|51Ax+jKnxT` zDD!pn^K^3!4$<><`|Nw>w2!y0-bG$-U9EFx&TkGfxMKX^X_20nua2kh#nM$vGHB@lx=pP84ETA`O!Trl;FAs3UO zK>%EU9Ow)%)Ckb+>YBWQyxYJ9N8r%`!%4x)y^*G zm;Lv^Ea%)1v5ix;cYC*=Zsz}ZoA1>fL_%SGN*2tvR{FVc++^ zpKRrx++G-1$gX?ME&oK9stQ}|j7`^;^H$bZFXB(pUbLrOdFr)e_tq9VYdz07_H+3g zmBX9US~GX(7xqqOb6E6albVY3hJ8u3_c#BWH}l((%PNr{`={T{4s=w`Tzk zy^ixPd@EuhI4AwQu}12*WuZ?WD@dyUPb>Fo4=IMV6(m!{6zJEyi{<`{e z|4mEsM7LhD%-H(iD#sI>D~GNabO!y;)^irSXpS0uJzu8F?F0s2DGLLGIWYL(DLgl^ zEHzI*IX_n~wIVUMASYE1ETUUbl%JKFT%r#Q-^79f{Q{r@U@$M8>x4&M@xfc-S+}+i{R_JnR2J>CJdzYhwCM3yDoqg|==iO4-m-krizFxFrVf?%I zW&1X^#b~{D;EYLM{qb|JwDhX-UIumPuj0|+`-59t?%lH!^=EyVyYt!1_@l3u9eE`z z_4@c{gT{-IdMivMLi*Uv$_&m%)@$s{$ZE2^vdc+mxq7#Rtm;O_p2_DG=J@NBgiqDT zy?jkN=*jN(^4oWRAMfw!ySc(JqS8F-PLp+!(~560_p;p5TN!8f-MKku(P7(+y)p0q z2i3GThp^vkl$>?EKtpTA#CpG8MTt$SQHe|B`X+a^Tzs7pvDf}|)}O=aD;HEr{EDyj zwwoZ{_r7Nz$EF(#S8rav!Derd$mf>}eb_&ytCc3-k<)w9axPY^Jwi@7<5S5bgD=m! zS;W_i^-b($TW;SSmJy<=rFgOLMesW#U+GT23r_wzv$h?2+C4K_&6h9g-=y7s=Ct?Z`yWF__0|4%%9{r|j4_u}GvkACP?d}BtW22go-XU?`=p1@Q9!gge) z24DgyNG&SKOfB}-(K_kl?W6b6XQQsaua}O-126qk`nn87lRp=K4bm1W<}M2QS|ofr z=yM5o*Qd=vlf8GG3hM4M{`@(I_bX3H^IsX}Cfh&GJAh>!Ba;X-_HqnVGC_a5qK g$&$toz`}?eOAtvfz?+o~WF7|)8UdX=l@-JT01{5fZU6uP diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index b34c0b03..7119c911 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step7

+

intigrating to k8s cluster first step8

From 43c0e5bd3809f4964894138deafa823388152646 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 12 Feb 2025 10:18:24 +0000 Subject: [PATCH 066/100] change11 --- Dockerfile | 2 +- webapp.war | Bin 0 -> 2011 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 webapp.war diff --git a/Dockerfile b/Dockerfile index 91823a59..d9afee06 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY webapp.war /usr/local/tomcat/webapps/ +COPY ./webapp.war /usr/local/tomcat/webapps/ EXPOSE 8080 CMD rm -rf /usr/local/tomcat/webapps/*.war CMD ["catalina.sh", "run"] diff --git a/webapp.war b/webapp.war new file mode 100644 index 0000000000000000000000000000000000000000..76b430fd8469d12c0544de3b59396fe33757c23e GIT binary patch literal 2011 zcmWIWW@h1HVBlb2(6MxjVn70%K(?=Ih@-BjpPPOFP?-o&83$OIv)r4j0YK?MAO?ye zl=(XPdAhj83%jEgfM^Bj;KrX=UP@vlx z!d;!N207+GHPGWI!YB7?pUMjmq&8RoZs|BjM1jHcEXXd4(R_J9F7fd~~k&DSt zpyi>RzhNbVrH?G%lXVxoxDQ$#>Fs=WX9K6*{)b17`OWzB`}nc99kx%;NQs}CC+?Jd z=8M&|uE`(f*4&m@o7nC*wKwgE<+84QFAaP?iz{;ISM2cFqOf5>$7kKjR||h~I#=!b zQ!h8^O53d!Ym(H>zg_3M-rOJjiWd>`o{6qeaYB112r)7+WH2!>@FV%CJT*zLA~$F5 zq=Wg*3L?ke{}b)APKceQbL`UPX|lU6Z!6i}_R71|QNeE2yZ!R7ZY6A5b8?5nzVClO z*~&e+y)dwlUH6(>{)sMC6}H$Jo31VAt*ozJ#Gj(QXivNH)N9A?tu1ucdY*Ia=khly zhc~CSX7120?48W!u;|AoH5KU%`;uz!Z~ixL=C>o4RU$w3PrsWT=%}2z_M&I3PQe=E zIjgLLJVSZPWpLcjnr?;LZ3cXkY26uyt|4+#7l|mzG?H#)BhHvfA08v|B&?kb@k`| zo0jB>ZoOogvGu`Kjwd!(4qY+m4Emp~=PY*795wiQzD$?f2@Jkc76t}$VDQ1ycWz=? zYMy>_ey(0>MPhD2PO2VQM7N+QKPxr4L?0Nwi3J7v1waMBU|u@OxBs$%K->GDqM=7k z%f!BgNP6FKxYh6FdLY-dG%b4ik&QX#o~=LLTWp)0d#K&viJ9^HGd7jSeP%yvIkfiI zuApykf4!JHi z_HAs7(R%H`8I!*HNf#iPUb2e-J~yJsir&-yZV=d+pdM_(;F@=93h z_3_UJjTa;JR+vbH^s$?j8Jvx**Vvhn)nt2Rmy^(P^==7S)s2ijlg}&6@z*H{pQ@32 z`I>allils*x9|Qw-rv)AbA@32fvEt5?Z`|G zzywl|T2zvmTI{W(b<)S%NAIK0MqPhjFCC2sUizo>bs35#e=hzSq%Bm;T@>`SNceQn z=MwI&Pn&}#d+#_E)ZJzL`Ew5MSDupQzcS2Cwtt*=082VXCJ|=rr5LDOf&c-Aw~ind zJPAXz;Vz`1`WTipsv~PdDzfoe3@T(H0A%q>AQMsK;&v{m(1ieyuJb@9Oc$aE2I+>l z8e1U@)Bm>dFOUf@l94@&tz1NCTL{eVFiWAOB)VqwQURg)0kD{b2QX=61hOUA5*y5t fC5`WZg%LTHAd+5yH!B;+JPsf<0y=pzD~JaGaP`Ie literal 0 HcmV?d00001 From e0bba395266601b2907c635b94e856b62cc953e0 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 12 Feb 2025 13:56:43 +0000 Subject: [PATCH 067/100] change12 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 7119c911..25975691 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step8

+

intigrating to k8s cluster first step9

From c34cae62c841504c48d6296756ec3c1659dd9515 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 12 Feb 2025 15:24:18 +0000 Subject: [PATCH 068/100] change13 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d9afee06..62d3ea0c 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY ./webapp.war /usr/local/tomcat/webapps/ +COPY ./webapp.war /usr/local/tomcat/webapps/ROOT.war EXPOSE 8080 CMD rm -rf /usr/local/tomcat/webapps/*.war CMD ["catalina.sh", "run"] From ecf09c3c79cddbd979a0e3f8b549e34eea615b31 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Wed, 12 Feb 2025 15:37:19 +0000 Subject: [PATCH 069/100] change13 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 62d3ea0c..d9afee06 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY ./webapp.war /usr/local/tomcat/webapps/ROOT.war +COPY ./webapp.war /usr/local/tomcat/webapps/ EXPOSE 8080 CMD rm -rf /usr/local/tomcat/webapps/*.war CMD ["catalina.sh", "run"] From ca33d0d0b165641215591e85ef7b0df96d3a329c Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 13 Feb 2025 10:37:10 +0000 Subject: [PATCH 070/100] new change --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 25975691..d82934ef 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step9

+

intigrating to k8s cluster first step10101010101010101010

From e5f85d3e245125aee91246eb075fbfa99098f25b Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 13 Feb 2025 12:26:29 +0000 Subject: [PATCH 071/100] gitops --- github/workflow/test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 github/workflow/test diff --git a/github/workflow/test b/github/workflow/test new file mode 100644 index 00000000..e69de29b From d5b95c615d661c4aeb85f87c0d6d5aead193e579 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 13 Feb 2025 12:28:41 +0000 Subject: [PATCH 072/100] gitops1 --- github/workflow/test | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 github/workflow/test diff --git a/github/workflow/test b/github/workflow/test deleted file mode 100644 index e69de29b..00000000 From 1f409f2010cac384a115407c7a5c1da80a9ebf0c Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 13 Feb 2025 12:41:15 +0000 Subject: [PATCH 073/100] gitops3 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index d82934ef..a019cfa8 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step10101010101010101010

+

intigrating to k8s cluster first step11

From eed926cb44fc61098ffc6eb0a2ed54c264e1c9a2 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 13 Feb 2025 12:56:17 +0000 Subject: [PATCH 074/100] gitops --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index a019cfa8..409de1e0 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step11

+

intigrating to k8s cluster first step12

From 455ddfcccc27179263845890a74aff6dd8f67a72 Mon Sep 17 00:00:00 2001 From: ammukaleem <145837922+ammukaleem@users.noreply.github.com> Date: Thu, 13 Feb 2025 19:16:54 +0530 Subject: [PATCH 075/100] from github --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 409de1e0..00534681 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step12

+

intigrating to k8s cluster first step13

From b04afbf3b9e30f6b728f1be52d6361767b459422 Mon Sep 17 00:00:00 2001 From: ammukaleem <145837922+ammukaleem@users.noreply.github.com> Date: Thu, 13 Feb 2025 19:46:36 +0530 Subject: [PATCH 076/100] test --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 00534681..3fbf4b93 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step13

+

intigrating to k8s cluster first step14

From c8e5cd86e6c3c6950f7df6b081ba1eb08a2b2f17 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 13 Feb 2025 14:44:30 +0000 Subject: [PATCH 077/100] Added GitHub Actions workflow --- github/workflows/sample.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 github/workflows/sample.yml diff --git a/github/workflows/sample.yml b/github/workflows/sample.yml new file mode 100644 index 00000000..d0453e03 --- /dev/null +++ b/github/workflows/sample.yml @@ -0,0 +1 @@ +# Sample GitHub Actions Workflow From 1ba9c8c73fba4a91db5618ead3ea8d4302176a54 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 13 Feb 2025 15:52:37 +0000 Subject: [PATCH 078/100] first gitactions --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 3fbf4b93..e8417f63 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step14

+

intigrating to k8s cluster first step15

From 1c44f74798cd1c137b8cfe5c304100775796f024 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 13 Feb 2025 16:47:33 +0000 Subject: [PATCH 079/100] gitops1 --- github/workflows/ci.yaml | 27 +++++++++++++++++++++++++++ github/workflows/sample.yml | 1 - 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 github/workflows/ci.yaml delete mode 100644 github/workflows/sample.yml diff --git a/github/workflows/ci.yaml b/github/workflows/ci.yaml new file mode 100644 index 00000000..3ec649ab --- /dev/null +++ b/github/workflows/ci.yaml @@ -0,0 +1,27 @@ +name: JavaApp Tomcat-jenkins-Docker-kubernates CI/CD + +on: + push: + branches: + - main + +jobs: + build-and-push: + runs-on: ubuntu-latest + env: + COMMIT_SHA: ${{ github.sha }} + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Pull Docker image + run: | + TAG=${{ secrets.DOCKER_USERNAME }}/frontend:build-${{ github.run_id }} + docker pull $IMAGE:$TAG + echo "Docker image pulled with tag $latest" diff --git a/github/workflows/sample.yml b/github/workflows/sample.yml deleted file mode 100644 index d0453e03..00000000 --- a/github/workflows/sample.yml +++ /dev/null @@ -1 +0,0 @@ -# Sample GitHub Actions Workflow From 6670278a26c4466c7cb5156b75c7d1fc8b8f922e Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 13 Feb 2025 17:42:02 +0000 Subject: [PATCH 080/100] gitops2 --- github/workflows/ci.yaml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/github/workflows/ci.yaml b/github/workflows/ci.yaml index 3ec649ab..eb37c0f3 100644 --- a/github/workflows/ci.yaml +++ b/github/workflows/ci.yaml @@ -22,6 +22,30 @@ jobs: - name: Pull Docker image run: | - TAG=${{ secrets.DOCKER_USERNAME }}/frontend:build-${{ github.run_id }} + TAG=${{ secrets.DOCKER_USERNAME }}/$IMAGE:${{ TAG }} docker pull $IMAGE:$TAG echo "Docker image pulled with tag $latest" + + - name: login-GitHub: + needs: Login to GitHub + runs-on: ubuntu-latest + steps: + - name: Checkout gitops repo + uses: actions/checkout@v4 + with: + repository: ammukaleem/saijava-gitops.git + token: ${{ secrets.GITOPS_TOKEN }} + path: saijava-gitops + ref: main + - name: Update image in deployment manifest + run: | + IMAGE_TAG=${{ secrets.DOCKER_USERNAME }}/$IMAGE:${{ TAG }} + cd saijava-gitops + ls -lrt + echo $IMAGE:$TAG + sed -i "s|image: .*|image: $IMAGE:$TAG|g" ./tomcat-dep.yaml + git config --global user.email ${{ vars.GIT_EMAIL }} + git config --global user.name ${{ vars.GIT_USERNAME }} + git add . + git commit -m "Update image to $IMAGE:$TAG" + git push origin main From 8d03d9b919cc9dab8ef198d0cfec6b2c29a62751 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Thu, 13 Feb 2025 18:04:13 +0000 Subject: [PATCH 081/100] gitops4 --- github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/github/workflows/ci.yaml b/github/workflows/ci.yaml index eb37c0f3..51920710 100644 --- a/github/workflows/ci.yaml +++ b/github/workflows/ci.yaml @@ -4,6 +4,9 @@ on: push: branches: - main + pull_request: + branches: + - main jobs: build-and-push: From 614215c6a9b67369ae75531df56a9e56d72a1f90 Mon Sep 17 00:00:00 2001 From: ammukaleem <145837922+ammukaleem@users.noreply.github.com> Date: Thu, 13 Feb 2025 23:41:59 +0530 Subject: [PATCH 082/100] test --- github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/github/workflows/ci.yaml b/github/workflows/ci.yaml index 51920710..0ea5e511 100644 --- a/github/workflows/ci.yaml +++ b/github/workflows/ci.yaml @@ -51,4 +51,5 @@ jobs: git config --global user.name ${{ vars.GIT_USERNAME }} git add . git commit -m "Update image to $IMAGE:$TAG" - git push origin main + git push origin main + # From 7e0599b7d9004eb34aa6622e376526dbb5d00f35 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Fri, 14 Feb 2025 15:41:19 +0000 Subject: [PATCH 083/100] modified ci.yaml --- github/workflows/ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/github/workflows/ci.yaml b/github/workflows/ci.yaml index 0ea5e511..ea7ab11f 100644 --- a/github/workflows/ci.yaml +++ b/github/workflows/ci.yaml @@ -4,9 +4,13 @@ on: push: branches: - main + workflow_dispatch: + pull_request: branches: - main + permissions: + contents: write jobs: build-and-push: From 16bfdad3e747ff22976afbb31dd807e2110d4332 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Fri, 14 Feb 2025 15:55:43 +0000 Subject: [PATCH 084/100] modified --- github/workflows/ci.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/github/workflows/ci.yaml b/github/workflows/ci.yaml index ea7ab11f..f1e308b7 100644 --- a/github/workflows/ci.yaml +++ b/github/workflows/ci.yaml @@ -2,13 +2,9 @@ name: JavaApp Tomcat-jenkins-Docker-kubernates CI/CD on: push: - branches: - - main + branches: [main] workflow_dispatch: - pull_request: - branches: - - main permissions: contents: write From 24c9a0a98c74135627fae3d535102d628cc303bf Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Fri, 14 Feb 2025 16:08:32 +0000 Subject: [PATCH 085/100] modified 1 --- github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github/workflows/ci.yaml b/github/workflows/ci.yaml index f1e308b7..58bed3b1 100644 --- a/github/workflows/ci.yaml +++ b/github/workflows/ci.yaml @@ -52,4 +52,4 @@ jobs: git add . git commit -m "Update image to $IMAGE:$TAG" git push origin main - # + ## From 6c4acb14f0d44b80afbd25ff5fcd2926a693dadb Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Sat, 15 Feb 2025 07:36:37 +0000 Subject: [PATCH 086/100] modified indent --- github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/github/workflows/ci.yaml b/github/workflows/ci.yaml index 58bed3b1..e6b91e4b 100644 --- a/github/workflows/ci.yaml +++ b/github/workflows/ci.yaml @@ -5,8 +5,8 @@ on: branches: [main] workflow_dispatch: - permissions: - contents: write +permissions: + contents: write jobs: build-and-push: From 125232519b534dd36b01d62295813f42ffb55a03 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 04:04:07 +0000 Subject: [PATCH 087/100] new step --- github/workflows/ci.yaml | 2 +- webapp/src/main/webapp/index.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/github/workflows/ci.yaml b/github/workflows/ci.yaml index e6b91e4b..fa9da0b0 100644 --- a/github/workflows/ci.yaml +++ b/github/workflows/ci.yaml @@ -27,7 +27,7 @@ jobs: run: | TAG=${{ secrets.DOCKER_USERNAME }}/$IMAGE:${{ TAG }} docker pull $IMAGE:$TAG - echo "Docker image pulled with tag $latest" + echo "Docker image pulled with tag $TAG" - name: login-GitHub: needs: Login to GitHub diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index e8417f63..b99d8cf2 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster first step15

+

intigrating to k8s cluster new step

From 4749e7bc2d3e8d6a3b19887822498512256ecb12 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 04:08:56 +0000 Subject: [PATCH 088/100] newstep --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff1946dd..c38e96ee 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # maven-project -# Test +# Test# Simple Maven Project From 85a3b6269262f644425771ce152ab0e88fc5c9cf Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 04:23:17 +0000 Subject: [PATCH 089/100] new step --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c38e96ee..ff1946dd 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # maven-project -# Test# +# Test Simple Maven Project From 30a829aa5a481a1f5f72814fea1ff73ec6d9ee66 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 04:25:23 +0000 Subject: [PATCH 090/100] new step --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff1946dd..c38e96ee 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # maven-project -# Test +# Test# Simple Maven Project From 6c15fc84296c65b179e3154316495fe731e29ffa Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 04:30:00 +0000 Subject: [PATCH 091/100] new step1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c38e96ee..ff1946dd 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # maven-project -# Test# +# Test Simple Maven Project From 700f41c4cc0b10fca6b9748151c9dea16baae956 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 04:35:25 +0000 Subject: [PATCH 092/100] new step --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff1946dd..c38e96ee 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # maven-project -# Test +# Test# Simple Maven Project From e6d0410cde6371cd66545f095142f386fbd4ef33 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 06:16:36 +0000 Subject: [PATCH 093/100] tag changed --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d9afee06..79bf3208 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,8 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY ./webapp.war /usr/local/tomcat/webapps/ -EXPOSE 8080 +COPY ./webapp.war /usr/local/tomcat/webapps CMD rm -rf /usr/local/tomcat/webapps/*.war CMD ["catalina.sh", "run"] - +EXPOSE 8080 From 8888cf847fabf635090925dda9195edc527ef291 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 07:48:06 +0000 Subject: [PATCH 094/100] test --- Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 79bf3208..911c2293 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY ./webapp.war /usr/local/tomcat/webapps +COPY /target/webapp.war /usr/local/tomcat/webapps CMD rm -rf /usr/local/tomcat/webapps/*.war CMD ["catalina.sh", "run"] EXPOSE 8080 diff --git a/README.md b/README.md index c38e96ee..ff1946dd 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # maven-project -# Test# +# Test Simple Maven Project From c4af4cf8aa2ec15e63e7f9c0f04690c3343c6de4 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 08:46:44 +0000 Subject: [PATCH 095/100] test1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff1946dd..c38e96ee 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # maven-project -# Test +# Test# Simple Maven Project From 2324e0b2dbd78549855698c828c831fa18d6c741 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 08:51:04 +0000 Subject: [PATCH 096/100] test3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 911c2293..91e9e7ce 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /target/webapp.war /usr/local/tomcat/webapps +COPY /var/lib/jenkins/workspace/new-pipeline/webapp/target/webapp/webapp.war /usr/local/tomcat/webapps CMD rm -rf /usr/local/tomcat/webapps/*.war CMD ["catalina.sh", "run"] EXPOSE 8080 From df58d8fffac29f1db1360e6219e0031d02a712b2 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 09:04:33 +0000 Subject: [PATCH 097/100] test4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 91e9e7ce..93891127 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /var/lib/jenkins/workspace/new-pipeline/webapp/target/webapp/webapp.war /usr/local/tomcat/webapps +COPY /var/lib/jenkins/workspace/new-pipeline/webapp/target/webapp.war /usr/local/tomcat/webapps CMD rm -rf /usr/local/tomcat/webapps/*.war CMD ["catalina.sh", "run"] EXPOSE 8080 From 3a2572bef8a0a6defea145b78309acffd2d2009a Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 09:11:10 +0000 Subject: [PATCH 098/100] test5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 93891127..79bf3208 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:9.0.8-jre8 # Maintainer LABEL MAINTAINER "Mohammad Kaleem" -COPY /var/lib/jenkins/workspace/new-pipeline/webapp/target/webapp.war /usr/local/tomcat/webapps +COPY ./webapp.war /usr/local/tomcat/webapps CMD rm -rf /usr/local/tomcat/webapps/*.war CMD ["catalina.sh", "run"] EXPOSE 8080 From 5ab0e49ba152542dc951d6da8994a5759af77b16 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 15:29:14 +0000 Subject: [PATCH 099/100] dir removed --- github/workflows/ci.yaml | 55 -------------------------------- webapp/src/main/webapp/index.jsp | 2 +- 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 github/workflows/ci.yaml diff --git a/github/workflows/ci.yaml b/github/workflows/ci.yaml deleted file mode 100644 index fa9da0b0..00000000 --- a/github/workflows/ci.yaml +++ /dev/null @@ -1,55 +0,0 @@ -name: JavaApp Tomcat-jenkins-Docker-kubernates CI/CD - -on: - push: - branches: [main] - workflow_dispatch: - -permissions: - contents: write - -jobs: - build-and-push: - runs-on: ubuntu-latest - env: - COMMIT_SHA: ${{ github.sha }} - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Pull Docker image - run: | - TAG=${{ secrets.DOCKER_USERNAME }}/$IMAGE:${{ TAG }} - docker pull $IMAGE:$TAG - echo "Docker image pulled with tag $TAG" - - - name: login-GitHub: - needs: Login to GitHub - runs-on: ubuntu-latest - steps: - - name: Checkout gitops repo - uses: actions/checkout@v4 - with: - repository: ammukaleem/saijava-gitops.git - token: ${{ secrets.GITOPS_TOKEN }} - path: saijava-gitops - ref: main - - name: Update image in deployment manifest - run: | - IMAGE_TAG=${{ secrets.DOCKER_USERNAME }}/$IMAGE:${{ TAG }} - cd saijava-gitops - ls -lrt - echo $IMAGE:$TAG - sed -i "s|image: .*|image: $IMAGE:$TAG|g" ./tomcat-dep.yaml - git config --global user.email ${{ vars.GIT_EMAIL }} - git config --global user.name ${{ vars.GIT_USERNAME }} - git add . - git commit -m "Update image to $IMAGE:$TAG" - git push origin main - ## diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index b99d8cf2..7d060ce0 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,4 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster new step

+

intigrating to k8s cluster final step

From 77fcffecf1f1e168fcc293a23ec47fb33dad9508 Mon Sep 17 00:00:00 2001 From: ammukaleem Date: Mon, 17 Feb 2025 15:37:33 +0000 Subject: [PATCH 100/100] final --- webapp/src/main/webapp/index.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 7d060ce0..b0aac3b0 100755 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -4,4 +4,5 @@

first step for Argocd project

second step Argocd project

final step Argocd project

-

intigrating to k8s cluster final step

+

intigrating to k8s cluster final step

+

complete