From 09aae8343c1fe6242cf81a70df667edc96f930b4 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 27 Jul 2018 20:11:57 +0530 Subject: [PATCH 001/172] Create Jenkinsfile Adding dockerfile --- Jenkinsfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..d119a6d3 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,27 @@ +FROM ubuntu:16.04 +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get install -y curl && \ + apt-get install -y software-properties-common && \ + add-apt-repository ppa:webupd8team/java -y && \ + apt-get update && \ + echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ + apt-get install -y oracle-java8-installer && \ + apt-get clean +RUN groupadd tomcat +RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat +RUN cd /tmp +RUN curl -O http://redrockdigimark.com/apachemirror/tomcat/tomcat-8/v8.5.29/bin/apache-tomcat-8.5.29.tar.gz +RUN mkdir /opt/tomcat +RUN gzip -V +RUN tar -xvzf apache-tomcat-8.5.29.tar.gz -C /opt/tomcat --strip-components=1 +RUN cd /opt/tomcat +RUN chgrp -R tomcat /opt/tomcat +ADD /var/lib/jenkins/workspace/ci-docker/target/java-tomcat-maven-example.war /opt/tomcat/webapps +#RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ +#RUN update-java-alternatives -l +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle +Run cd /opt/tomcat/bin +expose 8080 +#CMD /opt/tomcat/bin/catalina.sh run && tail -f /opt/tomcat/logs/catalina.out +CMD ["/opt/tomcat/bin/catalina.sh", "run"] From d955739b1102953c394cb0dd0f2c8ad3e444bc3b Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 27 Jul 2018 20:15:57 +0530 Subject: [PATCH 002/172] Rename Jenkinsfile to Dockerfile --- Jenkinsfile => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Jenkinsfile => Dockerfile (100%) diff --git a/Jenkinsfile b/Dockerfile similarity index 100% rename from Jenkinsfile rename to Dockerfile From 6bb9e7a97dd250f45f112d408de2bc96693081b6 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 27 Jul 2018 20:23:02 +0530 Subject: [PATCH 003/172] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d119a6d3..e622dd5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN gzip -V RUN tar -xvzf apache-tomcat-8.5.29.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat -ADD /var/lib/jenkins/workspace/ci-docker/target/java-tomcat-maven-example.war /opt/tomcat/webapps +COPY /var/lib/jenkins/workspace/ci-docker/target/java-tomcat-maven-example.war /opt/tomcat/webapps #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ #RUN update-java-alternatives -l ENV JAVA_HOME /usr/lib/jvm/java-8-oracle From a490145c2209da01fe8ca8c843e82653e6da53f9 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 27 Jul 2018 20:33:04 +0530 Subject: [PATCH 004/172] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e622dd5a..a2739b38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN gzip -V RUN tar -xvzf apache-tomcat-8.5.29.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat -COPY /var/lib/jenkins/workspace/ci-docker/target/java-tomcat-maven-example.war /opt/tomcat/webapps +COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ #RUN update-java-alternatives -l ENV JAVA_HOME /usr/lib/jvm/java-8-oracle From 1463aaf5eb5f03d4cbe52a13defa3781a6f89d87 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 16 Aug 2018 06:30:41 +0530 Subject: [PATCH 005/172] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2739b38..7c9e1636 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://redrockdigimark.com/apachemirror/tomcat/tomcat-8/v8.5.29/bin/apache-tomcat-8.5.29.tar.gz +RUN curl -O http://redrockdigimark.com/apachemirror/tomcat/tomcat-8/v8.5.32/bin/apache-tomcat-8.5.32.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.29.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.32.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps From cbe2dacd511cef060d9dc4087effa3eaa04996bc Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 2 Oct 2018 19:11:46 +0530 Subject: [PATCH 006/172] Update Dockerfile Changing tomcat link --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7c9e1636..6772f2f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://redrockdigimark.com/apachemirror/tomcat/tomcat-8/v8.5.32/bin/apache-tomcat-8.5.32.tar.gz +RUN curl -O http://mirrors.wuchna.com/apachemirror/tomcat/tomcat-8/v8.5.34/bin/apache-tomcat-8.5.34.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.32.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.34.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps From b8059efc85af06533290bf629cdf943956597d0c Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 3 Oct 2018 09:18:28 +0530 Subject: [PATCH 007/172] Create Jenkinsfile --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..ea7d9b4c --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,15 @@ +node(){ +stage ("clone"){ +} +stage ("build"){ +} +stage ("test-unittesting"){ +} +stage ("Sonarqube"){ +} +stage ("Creating docker container"){ +} + +stage ("docker verification"){ +} +} From 1e77102bb730cd1d14998a0e60a80937d8b741a4 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 3 Oct 2018 09:40:21 +0530 Subject: [PATCH 008/172] Update Jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index ea7d9b4c..92668c34 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,5 +11,7 @@ stage ("Creating docker container"){ } stage ("docker verification"){ +} + stage ("upload docker image to dockehu/artifactory"){ } } From 0a40bdcc36cf3228275bc4a8e622f9c161429f62 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 22 Jan 2019 10:33:32 +0530 Subject: [PATCH 009/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index c38169bb..02d4b272 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

Hello World!

+

Hello World! added new line for docker demo

From 2ea635c4316f4600647a617619c60d9514bc43ad Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 22 Jan 2019 10:36:05 +0530 Subject: [PATCH 010/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 02d4b272..327c449e 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

Hello World! added new line for docker demo

+

Hello World! New modification happended

From 8fd5ee62938902bad554075efd833bda9fe14542 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 22 Jan 2019 17:54:52 +0530 Subject: [PATCH 011/172] Update pom.xml added nexus deploy --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index 8e60eb85..ef1b17ab 100644 --- a/pom.xml +++ b/pom.xml @@ -41,4 +41,16 @@ + + + releases + + http://localhost:8081/repository/maven-releases/ + + + snapshots + + http://localhost:8081/repository/maven-snapshots/ + + From a0c6637386084f7645a9322da51bafc7cb00d8bd Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 8 Feb 2019 09:25:41 +0530 Subject: [PATCH 012/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 327c449e..ee5d2d4c 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

Hello World! New modification happended

+

New code added Hello World! New modification happended

From 263bc194c1bbfe29ac1f9db1854e3dbd2b11fcea Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 23 Feb 2019 07:55:14 +0530 Subject: [PATCH 013/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef1b17ab..eb9ed822 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ junit junit - 3.8.1 + 3.8.2 test From 444bedc400a259e43508ebb39946593bc1fb84fc Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 4 Mar 2019 07:35:33 +0530 Subject: [PATCH 014/172] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index de9dd576..02927686 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +//added new line # java-tomcat-maven-example This is an example ready-to-deploy java web application built for Tomcat using Maven and webapp-runner. From 6a55f09bf038a8be14746300e983a56d908aaaae Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 4 Mar 2019 07:36:42 +0530 Subject: [PATCH 015/172] test commit on 4th feb test commit on 4th feb --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 02927686..5e744c01 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -//added new line +//added new line sssss # java-tomcat-maven-example This is an example ready-to-deploy java web application built for Tomcat using Maven and webapp-runner. From a9d5992849ea790e02ec1f47db08283a4042cfb7 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 20 Mar 2019 07:36:51 +0530 Subject: [PATCH 016/172] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6772f2f4..c1a07a16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://mirrors.wuchna.com/apachemirror/tomcat/tomcat-8/v8.5.34/bin/apache-tomcat-8.5.34.tar.gz +RUN curl -O http://mirrors.wuchna.com/apachemirror/tomcat/tomcat-8/v8.5.34/bin/apache-tomcat-8.5.35.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.34.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.35.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps From dfc9942292dc7e27e9290c996bf83588d9445c3e Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 20 Mar 2019 07:39:55 +0530 Subject: [PATCH 017/172] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c1a07a16..3f487a07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://mirrors.wuchna.com/apachemirror/tomcat/tomcat-8/v8.5.34/bin/apache-tomcat-8.5.35.tar.gz +RUN curl -O http://mirrors.wuchna.com/apachemirror/tomcat/tomcat-8/v8.5.35/bin/apache-tomcat-8.5.35.tar.gz RUN mkdir /opt/tomcat RUN gzip -V RUN tar -xvzf apache-tomcat-8.5.35.tar.gz -C /opt/tomcat --strip-components=1 From bde61066c4a6ffd028dcaf05cbda76e62d4cfadf Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 20 Mar 2019 07:40:56 +0530 Subject: [PATCH 018/172] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f487a07..1105ed34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://mirrors.wuchna.com/apachemirror/tomcat/tomcat-8/v8.5.35/bin/apache-tomcat-8.5.35.tar.gz +RUN curl -O http://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.38/bin/apache-tomcat-8.5.38.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.35.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.38.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps From be5e91c8b08ad116f3906613828a7a7fdd15e961 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 20 Mar 2019 07:43:16 +0530 Subject: [PATCH 019/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index ee5d2d4c..f504cabe 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

New code added Hello World! New modification happended

+

New code added Hello World! Added some new line on 20th march

From 623fc3d233603c611bc33fce76d8bca7e18c2237 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 20 Mar 2019 07:50:14 +0530 Subject: [PATCH 020/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index f504cabe..6e624839 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

New code added Hello World! Added some new line on 20th march

+

New code added Hello World! Added some new line on 20th march---Verify docker

From 3a1ffa5904233d22f10c3e0093dee28af49bd4a5 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 28 Mar 2019 10:39:03 +0530 Subject: [PATCH 021/172] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1105ed34..fd36342c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.38/bin/apache-tomcat-8.5.38.tar.gz +RUN curl -O http://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.39/bin/apache-tomcat-8.5.39.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.38.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.39.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps From f3e975fc9374d36f466c9c19fe7458909a575f36 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 2 Apr 2019 10:53:45 +0530 Subject: [PATCH 022/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 6e624839..da397c46 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

New code added Hello World! Added some new line on 20th march---Verify docker

+

!!!!!!!!!!!!!!!!!April 2nd change!!!!!!!!!!!!!!!!!!

From e778d40efe82a3b1a110fbcfc8628f94783fd16d Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 2 May 2019 08:20:55 +0530 Subject: [PATCH 023/172] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 92668c34..e2777780 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -node(){ +node('testagent'){ stage ("clone"){ } stage ("build"){ From f3aa56bb38d90cbd7b627a4669f6a3fc9d724215 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 6 May 2019 07:50:17 +0530 Subject: [PATCH 024/172] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e2777780..92668c34 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -node('testagent'){ +node(){ stage ("clone"){ } stage ("build"){ From 79f6abdef6d64d8659024a55401c3ed9e27aa375 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 10 May 2019 05:23:53 +0530 Subject: [PATCH 025/172] Update Jenkinsfile --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 92668c34..dbca4df3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,4 +14,7 @@ stage ("docker verification"){ } stage ("upload docker image to dockehu/artifactory"){ } + stage('Clean-workspace'){ + cleanWs() + } } From 8a44512e69c0da73e65a74822c3d4e241f827791 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 11 May 2019 10:58:48 +0530 Subject: [PATCH 026/172] Update Jenkinsfile --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index dbca4df3..1f914bdc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,11 @@ node(){ stage ("clone"){ + checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/csenapati12/java-tomcat-maven-example.git']]]) } stage ("build"){ + withMaven(maven:'Maven_3_3_9', mavenLocalRepo: '.repository',mavenSettingsConfig:'my-config') { + sh 'mvn clean install' + } } stage ("test-unittesting"){ } From 9b2ba9c5d4a76e167893e9de87715773cc0f0755 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 11 May 2019 22:40:26 +0530 Subject: [PATCH 027/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eb9ed822..0bdb6922 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ releases - http://localhost:8081/repository/maven-releases/ + http://localhost:8089/repository/maven-releases/ snapshots - http://localhost:8081/repository/maven-snapshots/ + http://localhost:8089/repository/maven-snapshots/ From 5001e2255746a8bc48507e40e7e9984373faf5fe Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 14 Jun 2019 09:53:13 +0530 Subject: [PATCH 028/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0bdb6922..0d9a9218 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ junit junit - 3.8.2 + 4.3 test From 4a22c5f5ce051dc5626aeccf5c43eb67746d3102 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 18 Jun 2019 09:54:38 +0530 Subject: [PATCH 029/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d9a9218..ab465602 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 1.0-SNAPSHOT + 7.0-SNAPSHOT hello Maven Webapp http://maven.apache.org From 10518bedbe4aaa42f2938ae5ba3608efbc31ad85 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 18 Jun 2019 09:57:02 +0530 Subject: [PATCH 030/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab465602..7e87d9f4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 7.0-SNAPSHOT + 9.0-SNAPSHOT hello Maven Webapp http://maven.apache.org From 4e9c5c1b1628bdb0f5fd3b8d9a8a1c1f05cd6b2b Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 18 Jun 2019 09:58:51 +0530 Subject: [PATCH 031/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e87d9f4..54e02bb7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 9.0-SNAPSHOT + 9.0-RELEASE hello Maven Webapp http://maven.apache.org From c363a8694baaaed984bc772c4f9b7b43640a0f0c Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 2 Jul 2019 12:47:00 +0530 Subject: [PATCH 032/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54e02bb7..7e87d9f4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 9.0-RELEASE + 9.0-SNAPSHOT hello Maven Webapp http://maven.apache.org From 63c142f23296b173ee44b5744a3d99ac7ad2135d Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 11 Jul 2019 23:27:35 +0530 Subject: [PATCH 033/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e87d9f4..da6a057a 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - java-tomcat-maven-example + org.apache.maven.plugins From a4c8d600ec93ae506bbcd8796c66ffda553b6779 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 12 Jul 2019 09:58:18 +0530 Subject: [PATCH 034/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index da6a057a..4f48d03b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 9.0-SNAPSHOT + 8.0-SNAPSHOT hello Maven Webapp http://maven.apache.org @@ -16,7 +16,7 @@ - + org.apache.maven.plugins From be5815f8516cf39487f276fa8e57a5388f298ad9 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 17 Jul 2019 09:14:40 +0530 Subject: [PATCH 035/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4f48d03b..2cf4e5f9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 8.0-SNAPSHOT + 4.0-SNAPSHOT hello Maven Webapp http://maven.apache.org From beb326a77a45ce156502996f4c92ec583b09bd1c Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 17 Jul 2019 09:46:57 +0530 Subject: [PATCH 036/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2cf4e5f9..4e944611 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 4.0-SNAPSHOT + 4.1-SNAPSHOT hello Maven Webapp http://maven.apache.org From 8cbe6995f6b0653112109b27e6ba538b810d0bb8 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 17 Jul 2019 09:51:53 +0530 Subject: [PATCH 037/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e944611..dcbaf1fa 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 4.1-SNAPSHOT + 4.1-RELEASE hello Maven Webapp http://maven.apache.org From a750ffe9f9d9433e94f121d3f225c2020f45ba58 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 19 Jul 2019 09:35:58 +0530 Subject: [PATCH 038/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dcbaf1fa..00b92a27 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - + java-tomcat-maven-example org.apache.maven.plugins From cc56a07344a65642cf8cdbd3690f67f45adfdb53 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 19 Jul 2019 10:04:42 +0530 Subject: [PATCH 039/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index da397c46..e568889a 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

!!!!!!!!!!!!!!!!!April 2nd change!!!!!!!!!!!!!!!!!!

+

testing docker code on run time

From 7a4ba91717f958e252f3d84119ec7e26e0c13144 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 19 Jul 2019 10:06:07 +0530 Subject: [PATCH 040/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index e568889a..209fb1a3 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

testing docker code on run time

+

new chane

From 75a0a21f2fa7fe6dd9921afb831c56abb238b28e Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 22 Jul 2019 09:11:29 +0530 Subject: [PATCH 041/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 209fb1a3..b9f42462 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

new chane

+

!!!!!!!!!!!Master!!!!!!!!!!

From 0b6c736d8cc303bfcecc593b25b0a62e91287c9f Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 5 Aug 2019 22:29:44 +0530 Subject: [PATCH 042/172] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1f914bdc..1d9f06fc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -node(){ +node('jenkins-slave1'){ stage ("clone"){ checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/csenapati12/java-tomcat-maven-example.git']]]) } From 70e11c3e9f238cf9c1ddaeb1e18b2194083bcebd Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 8 Aug 2019 12:00:34 +0530 Subject: [PATCH 043/172] Update Jenkinsfile --- Jenkinsfile | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d9f06fc..4904228c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,24 +1,20 @@ -node('jenkins-slave1'){ -stage ("clone"){ - checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/csenapati12/java-tomcat-maven-example.git']]]) -} -stage ("build"){ - withMaven(maven:'Maven_3_3_9', mavenLocalRepo: '.repository',mavenSettingsConfig:'my-config') { - sh 'mvn clean install' - } -} -stage ("test-unittesting"){ -} -stage ("Sonarqube"){ -} -stage ("Creating docker container"){ -} +pipeline { -stage ("docker verification"){ -} - stage ("upload docker image to dockehu/artifactory"){ -} - stage('Clean-workspace'){ - cleanWs() - } + agent any + parameters { + choice choices: ['DeployL1_L2_L3', 'L4', 'L6'], description: 'Please select the environment to Deploy!!!', name: 'ENV_NAME' + choice choices: ['HSVALIDATION_BUSINESS_SERVICE', 'HSVALIDATION_DATA_SERVICE'], description: 'Please select the application!!!', name: 'APP_NAME' } + stages { + + stage('Code checkout') { + when { + expression { params.ENV_NAME =='DeployL1_L2_L3'} + } + steps { + echo "helllo" + } + } + + } + } From 23ebd20d6d7c641de43d5fc24028d67ad32b93b2 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 8 Aug 2019 12:02:28 +0530 Subject: [PATCH 044/172] Create Jenkinsfile-new --- Jenkinsfile-new | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Jenkinsfile-new diff --git a/Jenkinsfile-new b/Jenkinsfile-new new file mode 100644 index 00000000..b4685813 --- /dev/null +++ b/Jenkinsfile-new @@ -0,0 +1,21 @@ +pipeline { + + agent any + parameters { + choice choices: ['DeployL1_L2_L3', 'L4', 'L6'], description: 'Please select the environment to Deploy!!!', name: 'ENV_NAME' + choice choices: ['HSVALIDATION_BUSINESS_SERVICE', 'HSVALIDATION_DATA_SERVICE'], description: 'Please select the application!!!', name: 'APP_NAME' + choice choices: ['HSVALIDATION_BUSINESS_SERVICE1', 'HSVALIDATION_DATA_SERVICE2'], description: 'Please select the application!!!', name: 'APP_NAME' +} + stages { + + stage('Code checkout') { + when { + expression { params.ENV_NAME =='DeployL1_L2_L3'} + } + steps { + echo "helllo" + } + } + + } + } From 0f1609de1feae60f2cd4af91d12865128a31274e Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 11 Aug 2019 21:46:08 +0530 Subject: [PATCH 045/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index b9f42462..be6d29d6 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

!!!!!!!!!!!Master!!!!!!!!!!

+

!!!!!!!!!!!Master!!!!!!!!!!--added on 11 Aug

From 7baa96be9d2d85b51daa2684d7d819b5507d04df Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 12 Aug 2019 22:17:58 +0530 Subject: [PATCH 046/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00b92a27..aab404d3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 4.1-RELEASE + 7.1-SNAPSHOT hello Maven Webapp http://maven.apache.org From 255effcaa02dca46fa21a44add2aa6b041a4b625 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 28 Aug 2019 09:52:34 +0530 Subject: [PATCH 047/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index be6d29d6..d39afc2d 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

!!!!!!!!!!!Master!!!!!!!!!!--added on 11 Aug

+

!!!!!!!!!!!Master!!!!!!! 28th Aug

From f5c378e7243866b2d6b418cf75cb9d4642405d59 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 28 Aug 2019 09:56:41 +0530 Subject: [PATCH 048/172] Update index.jsp --- src/main/webapp/index.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index d39afc2d..ee29b41a 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,6 @@ -

!!!!!!!!!!!Master!!!!!!! 28th Aug

+

!!!!!!!!!!!Master!!!!!!! 28tasfdsdfsfsdfsfh Aug

+

!!!!!!=New loine added

From a1a7de60b9b372eaf6fddc98141e7500e951face Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 9 Sep 2019 22:51:40 +0530 Subject: [PATCH 049/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index ee29b41a..f9358e70 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,5 +2,6 @@

!!!!!!!!!!!Master!!!!!!! 28tasfdsdfsfsdfsfh Aug

!!!!!!=New loine added

+

Today is 9th Sept

From f3a378fe949a7271c7dd37ccc4592746a4c3dce3 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 9 Sep 2019 22:52:29 +0530 Subject: [PATCH 050/172] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd36342c..e49ce72d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.39/bin/apache-tomcat-8.5.39.tar.gz +RUN curl -O http://apachemirror.wuchna.com/tomcat/tomcat-8/v8.5.45/bin/apache-tomcat-8.5.45.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.39.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.45.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps From f97fef436221b8f8640f00591556098007b1557c Mon Sep 17 00:00:00 2001 From: teluharish <55058425+teluharish@users.noreply.github.com> Date: Mon, 9 Sep 2019 21:19:00 -0400 Subject: [PATCH 051/172] adding devops session updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e744c01..f6e084a4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ //added new line sssss # java-tomcat-maven-example - +#adding devops This is an example ready-to-deploy java web application built for Tomcat using Maven and webapp-runner. ## Running Locally From 42b4c30ab56c61e2db919c6bd64144017580a540 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 11 Sep 2019 22:21:31 +0530 Subject: [PATCH 052/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index f9358e70..e5799992 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,6 +2,6 @@

!!!!!!!!!!!Master!!!!!!! 28tasfdsdfsfsdfsfh Aug

!!!!!!=New loine added

-

Today is 9th Sept

+

Today is 11th Sept

From 9ffb41cc676f7deabdf5b0e1fe92bf99eb577024 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 11 Sep 2019 22:23:35 +0530 Subject: [PATCH 053/172] Update index.jsp --- src/main/webapp/index.jsp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index e5799992..46d931b3 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,7 +1,5 @@ -

!!!!!!!!!!!Master!!!!!!! 28tasfdsdfsfsdfsfh Aug

-

!!!!!!=New loine added

Today is 11th Sept

From ff2308634dc32fd4012a7573d278ebdad7528e12 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 11 Sep 2019 22:36:01 +0530 Subject: [PATCH 054/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 46d931b3..9617505f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,6 @@

Today is 11th Sept

+

Added another new line

From 39a4ec44961270b30727b26df40ce4ad1261b3f7 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 11 Sep 2019 22:37:27 +0530 Subject: [PATCH 055/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 9617505f..72072cce 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,5 +2,6 @@

Today is 11th Sept

Added another new line

+

Added testing scenario

From da9f42d256cdc4d94d918111f2000d4100dca470 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 12 Sep 2019 10:36:52 +0530 Subject: [PATCH 056/172] Update Jenkinsfile --- Jenkinsfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 4904228c..580a73ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,6 +15,20 @@ pipeline { echo "helllo" } } + + stage('Code checkout') { + when { + expression { params.ENV_NAME =='DeployL1_L2_L3'} + } + steps { + scripts{ + sh ''' + docker build -t testimage . + docker run --name=newcontainer-d -p 9898:8080 testimage + ''' + } + } + } } } From 18d0ba837cce8acd6df900cf630491e854527671 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 12 Sep 2019 10:37:40 +0530 Subject: [PATCH 057/172] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 580a73ef..c189e711 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { scripts{ sh ''' docker build -t testimage . - docker run --name=newcontainer-d -p 9898:8080 testimage + docker run --name=newcontainer -d -p 9898:8080 testimage ''' } } From 0ab076282c63934bbeab33ef6916b4e31f74c1b9 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 12 Sep 2019 10:46:36 +0530 Subject: [PATCH 058/172] Create Jenkinsfile-docker --- Jenkinsfile-docker | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile-docker diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker new file mode 100644 index 00000000..0dc47a8f --- /dev/null +++ b/Jenkinsfile-docker @@ -0,0 +1,15 @@ +node(){ +checkout scm + stage('Code build'){ + sh " + mvn package + " + } + stage('Docker build and start'){ + sh ''' + docker build -t testimage . + docker run --name=newcontainer -d -p 9898:8080 testimage + ''' + } + +} From 8a05da2448e41caca3ddc808fa3bc54f36cd852c Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 12 Sep 2019 10:48:30 +0530 Subject: [PATCH 059/172] Update Jenkinsfile-docker --- Jenkinsfile-docker | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index 0dc47a8f..8eb2a58f 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -1,9 +1,7 @@ node(){ checkout scm stage('Code build'){ - sh " - mvn package - " + sh "mvn package" } stage('Docker build and start'){ sh ''' From d84c92647ca7d13066c499c0da2c03b83884c8a4 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 12 Sep 2019 10:51:28 +0530 Subject: [PATCH 060/172] Update index.jsp --- src/main/webapp/index.jsp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 72072cce..87999006 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,7 +1,6 @@ -

Today is 11th Sept

-

Added another new line

-

Added testing scenario

+ +

12th -----Added testing scenario---12th sept

From fef86b89bdfd7214ccfd8b72ef5a85d1464fd145 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 12 Sep 2019 10:53:56 +0530 Subject: [PATCH 061/172] Update Jenkinsfile-docker --- Jenkinsfile-docker | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index 8eb2a58f..f54d949d 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -5,6 +5,9 @@ checkout scm } stage('Docker build and start'){ sh ''' + docker stop newcontainer + docker rm -f newcontainer + docker rmi testimage docker build -t testimage . docker run --name=newcontainer -d -p 9898:8080 testimage ''' From d5ff135d5f5d76cc7a625389d6b4fe80f7580cbb Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 12 Sep 2019 11:04:10 +0530 Subject: [PATCH 062/172] Update Jenkinsfile-docker --- Jenkinsfile-docker | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index f54d949d..8c4847c2 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -5,11 +5,21 @@ checkout scm } stage('Docker build and start'){ sh ''' + + docker build -t testimage . + docker run --name=newcontainer -d -p 9898:8080 testimage + ''' + } + stage('Smoke testing and result'){ + echo "smoke testing" + } + + stage('Docker build and start'){ + sh ''' docker stop newcontainer docker rm -f newcontainer docker rmi testimage - docker build -t testimage . - docker run --name=newcontainer -d -p 9898:8080 testimage + ''' } From bf27d65337b7512807b854d12d43e0f374f97dc2 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 19 Sep 2019 07:15:59 +0530 Subject: [PATCH 063/172] test pull SCM --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f6e084a4..cefddf07 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -//added new line sssss +//added new line for test pull SCM # java-tomcat-maven-example #adding devops This is an example ready-to-deploy java web application built for Tomcat using Maven and webapp-runner. From 272b0fe3154780aa33dbbb97ccc73ffa857b9db8 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 19 Sep 2019 11:15:25 +0530 Subject: [PATCH 064/172] Update Jenkinsfile --- Jenkinsfile | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c189e711..7a182e4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,34 +1,8 @@ -pipeline { - - agent any - parameters { - choice choices: ['DeployL1_L2_L3', 'L4', 'L6'], description: 'Please select the environment to Deploy!!!', name: 'ENV_NAME' - choice choices: ['HSVALIDATION_BUSINESS_SERVICE', 'HSVALIDATION_DATA_SERVICE'], description: 'Please select the application!!!', name: 'APP_NAME' -} - stages { - - stage('Code checkout') { - when { - expression { params.ENV_NAME =='DeployL1_L2_L3'} - } - steps { - echo "helllo" - } - } - - stage('Code checkout') { - when { - expression { params.ENV_NAME =='DeployL1_L2_L3'} - } - steps { - scripts{ - sh ''' +node(){ +checkout scm +stage('Code checkout') { + sh ''' docker build -t testimage . docker run --name=newcontainer -d -p 9898:8080 testimage - ''' - } - } - } - } } From 5d5830d7b067d62e0a328e1e1516b7c0160edfd2 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 19 Sep 2019 11:16:30 +0530 Subject: [PATCH 065/172] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 7a182e4c..a732767b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,5 +4,6 @@ stage('Code checkout') { sh ''' docker build -t testimage . docker run --name=newcontainer -d -p 9898:8080 testimage + ''' } } From 8929500aa950028230ea7f0195b6f90ecdb6be05 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 19 Sep 2019 11:18:34 +0530 Subject: [PATCH 066/172] Update Jenkinsfile --- Jenkinsfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a732767b..419a597e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,12 @@ node(){ -checkout scm -stage('Code checkout') { +checkout scm +stage('Maven Build') { + sh ''' + mvn package + + ''' + } +stage('Docker Build') { sh ''' docker build -t testimage . docker run --name=newcontainer -d -p 9898:8080 testimage From 521902b4ae0bfa4bf515570afb9f65c9d1b565ca Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 15 Oct 2019 06:55:42 +0530 Subject: [PATCH 067/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 87999006..0f379964 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,6 +1,6 @@ -

12th -----Added testing scenario---12th sept

+

15th Oct

From d08d2512007aab4172ec00cfb824c8aa40b41ec6 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 15 Oct 2019 06:59:59 +0530 Subject: [PATCH 068/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 0f379964..42aa6d56 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,5 +2,6 @@

15th Oct

+

another line added to test the code

From 1d4dd6964a1e6db2bda8ab607a04f33ff62138b4 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 15 Oct 2019 07:06:20 +0530 Subject: [PATCH 069/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 42aa6d56..86666687 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,6 +2,6 @@

15th Oct

-

another line added to test the code

+

another line added to test the code Jenkins automation

From 5048d92e9b9b3040b2446f3b85ce69c1b005fdd6 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 15 Oct 2019 07:13:08 +0530 Subject: [PATCH 070/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 86666687..4569602a 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,5 +3,6 @@

15th Oct

another line added to test the code Jenkins automation

+

11111111111another line added to test the code Jenkins automation111111111111111

From 0fd4668fb4c83c75c3a55fd7277bfaa1741cc5c1 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 15 Oct 2019 07:21:21 +0530 Subject: [PATCH 071/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 4569602a..40f4f981 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,6 +3,6 @@

15th Oct

another line added to test the code Jenkins automation

-

11111111111another line added to test the code Jenkins automation111111111111111

+

latest code

From ad825bb12e6e03fe3a83f918139317fdf4cf6f59 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 15 Oct 2019 07:23:26 +0530 Subject: [PATCH 072/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 40f4f981..23fda7f4 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -4,5 +4,6 @@

15th Oct

another line added to test the code Jenkins automation

latest code

+

111latest code111

From 69a79fc97d331d5726dfdf55427ace443a1a9315 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 23 Dec 2019 22:46:11 +0530 Subject: [PATCH 073/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aab404d3..6405f7ec 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@
- java-tomcat-maven-example + org.apache.maven.plugins From 66da6df0b799b019b374e1af949a23d94fc26c9c Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 23 Dec 2019 22:51:04 +0530 Subject: [PATCH 074/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6405f7ec..5b16c4ad 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 7.1-SNAPSHOT + ${version} hello Maven Webapp http://maven.apache.org From 0bc48428980f610cfe25d5481fa61cfddf9e823d Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 28 Jan 2020 09:13:01 +0530 Subject: [PATCH 075/172] Update index.jsp --- src/main/webapp/index.jsp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 23fda7f4..6a0a0efd 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,9 +1,6 @@ -

15th Oct

-

another line added to test the code Jenkins automation

-

latest code

-

111latest code111

+

Jan 28

From 9c87375c0f6507e7d8eb790f8c711bec8566ca75 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 28 Jan 2020 09:21:52 +0530 Subject: [PATCH 076/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b16c4ad..8422f38b 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@
- + java-tomcat-maven-example org.apache.maven.plugins From adcd79d4a7d2a467e08ce84d146b2bb8a47664dc Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 10 Feb 2020 11:27:50 +0530 Subject: [PATCH 077/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8422f38b..c43bd8f3 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ releases - http://localhost:8089/repository/maven-releases/ + http://35.231.125.240:8081/repository/maven-releases/ snapshots - http://localhost:8089/repository/maven-snapshots/ + http://35.231.125.240/repository/maven-snapshots/ From a76173b604fe96e0e04768fe1319a1615075d83f Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 10 Feb 2020 11:45:38 +0530 Subject: [PATCH 078/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c43bd8f3..3fcdcf67 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ snapshots - http://35.231.125.240/repository/maven-snapshots/ + http://35.231.125.240:8081/repository/maven-snapshots/ From 4b778db64c6ae3f94ea3b3d96569641b3a82f175 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Feb 2020 15:26:03 +0530 Subject: [PATCH 079/172] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e49ce72d..7dd24dad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://apachemirror.wuchna.com/tomcat/tomcat-8/v8.5.45/bin/apache-tomcat-8.5.45.tar.gz +RUN curl -O http://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.51/bin/apache-tomcat-8.5.51.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.45.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.51.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps From a1c29baf353a3adaf6f4b7a423740cf269fdf0c5 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Feb 2020 15:28:13 +0530 Subject: [PATCH 080/172] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7dd24dad..811f62e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && \ add-apt-repository ppa:webupd8team/java -y && \ apt-get update && \ echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ - apt-get install -y oracle-java8-installer && \ + apt-get install -y install -y openjdk-8-jdk && \ apt-get clean RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat From 76a22c2079eaccfbc393b5216e0cca3083481dc2 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Feb 2020 15:28:52 +0530 Subject: [PATCH 081/172] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 811f62e6..e19fa692 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN chgrp -R tomcat /opt/tomcat COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ #RUN update-java-alternatives -l -ENV JAVA_HOME /usr/lib/jvm/java-8-oracle +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 Run cd /opt/tomcat/bin expose 8080 #CMD /opt/tomcat/bin/catalina.sh run && tail -f /opt/tomcat/logs/catalina.out From ee801a5067e98b26e1b295130608b75cdd5d5a9a Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Feb 2020 15:31:55 +0530 Subject: [PATCH 082/172] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e19fa692..66388a58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,18 +6,18 @@ RUN apt-get update && \ add-apt-repository ppa:webupd8team/java -y && \ apt-get update && \ echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ - apt-get install -y install -y openjdk-8-jdk && \ + apt-get install -y openjdk-8-jdk && \ apt-get clean RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.51/bin/apache-tomcat-8.5.51.tar.gz +RUN curl -O http://apachemirror.wuchna.com/tomcat/tomcat-8/v8.5.51/bin/apache-tomcat-8.5.51.tar.gz RUN mkdir /opt/tomcat RUN gzip -V RUN tar -xvzf apache-tomcat-8.5.51.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat -COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps +ADD java-tomcat-maven-example.war /opt/tomcat/webapps #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ #RUN update-java-alternatives -l ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 From f09b5703fa6e9e77ba35fd9142a48afcbc7521ba Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Feb 2020 15:32:34 +0530 Subject: [PATCH 083/172] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 66388a58..a26a91a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN gzip -V RUN tar -xvzf apache-tomcat-8.5.51.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat -ADD java-tomcat-maven-example.war /opt/tomcat/webapps +ADD target/java-tomcat-maven-example.war /opt/tomcat/webapps #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ #RUN update-java-alternatives -l ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 From d3bb162b1c491104a7d09cc4a01a507b7bfbc41a Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Feb 2020 15:58:30 +0530 Subject: [PATCH 084/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fcdcf67..2af90a71 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - ${version} + 2.0-SNAPSHOT hello Maven Webapp http://maven.apache.org From 59eb1818d3ed6203755b019a521a8dbf233b2613 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Feb 2020 15:58:57 +0530 Subject: [PATCH 085/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 6a0a0efd..61f93651 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,6 +1,6 @@ -

Jan 28

+

15 Feb

From 210f73c618c4dec6a508d576873ca7270de7e62f Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Feb 2020 16:28:26 +0530 Subject: [PATCH 086/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 61f93651..8ebdadb9 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,5 +2,6 @@

15 Feb

+

15 Fewwwwwwb

From 29e27aed9ffe84f48e8a7fc8f2509cecb1377cc3 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 19 Feb 2020 22:56:13 +0530 Subject: [PATCH 087/172] Update Jenkinsfile --- Jenkinsfile | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 419a597e..77177e0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,11 +1,32 @@ node(){ -checkout scm +checkout scm + + stage('compile') { + sh ''' + mvn compile + + ''' + } + stage('test') { + sh ''' + mvn test + + ''' + } + stage('Maven Build') { sh ''' mvn package ''' } + stage('deploy to nexus') { + sh ''' + mvn package + + ''' + } + stage('Docker Build') { sh ''' docker build -t testimage . From 887f2997e8122b6484ec574e3304b24e27938173 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 19 Feb 2020 23:00:29 +0530 Subject: [PATCH 088/172] Update Jenkinsfile --- Jenkinsfile | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 77177e0f..bfbce308 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,35 +2,20 @@ node(){ checkout scm stage('compile') { - sh ''' - mvn compile - - ''' + echo "compile" } stage('test') { - sh ''' - mvn test - - ''' + echo "test" } stage('Maven Build') { - sh ''' - mvn package - - ''' + } stage('deploy to nexus') { - sh ''' - mvn package - - ''' + echo "deploy" } stage('Docker Build') { - sh ''' - docker build -t testimage . - docker run --name=newcontainer -d -p 9898:8080 testimage - ''' + echo "Docker build" } } From fc495bbc8d5a951ce7e6ab83486b5d7d2e2a8ae9 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 24 Feb 2020 10:41:28 +0530 Subject: [PATCH 089/172] Update index.jsp --- src/main/webapp/index.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 8ebdadb9..8785c1ab 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,7 +1,7 @@ -

15 Feb

-

15 Fewwwwwwb

+

24th Feb

+ From 73371612e9369d6338f6c7072d6b7797f0027d66 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 24 Feb 2020 10:49:08 +0530 Subject: [PATCH 090/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 8785c1ab..1b4e92dd 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,6 +2,7 @@

24th Feb

+

25th Feb

From 42373db8b2fe3c17224125543ebe39d9dbf853ed Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 24 Feb 2020 10:50:07 +0530 Subject: [PATCH 091/172] Update index.jsp --- src/main/webapp/index.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 1b4e92dd..a549d8ce 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,8 +1,8 @@ -

24th Feb

-

25th Feb

+ +

added new line

From 9772829c9494e43495a69300f9a469d3a88496c7 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 24 Feb 2020 10:53:27 +0530 Subject: [PATCH 092/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2af90a71..9a416a05 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ releases - http://35.231.125.240:8081/repository/maven-releases/ + http://35.184.195.6:8081/repository/maven-releases/ snapshots - http://35.231.125.240:8081/repository/maven-snapshots/ + http://35.184.195.6:8081/repository/maven-snapshots/ From a60f41a41201a5b3d6f29861d6caba34985fc41c Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 24 Feb 2020 10:57:54 +0530 Subject: [PATCH 093/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a416a05..1bfb9ac8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 2.0-SNAPSHOT + 9.0 hello Maven Webapp http://maven.apache.org From 5d66c371967e533bbc308e82995dea8b4d70a4cb Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 24 Feb 2020 10:58:42 +0530 Subject: [PATCH 094/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1bfb9ac8..635ea3ec 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - java-tomcat-maven-example + org.apache.maven.plugins From d63527df24430eea10a118488245bcdba88b4df7 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 24 Feb 2020 11:13:48 +0530 Subject: [PATCH 095/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 635ea3ec..488588e7 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ - + releases http://35.184.195.6:8081/repository/maven-releases/ From 9a4b4ae4068405183863241044f39c2d24e80157 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 24 Feb 2020 23:01:59 +0530 Subject: [PATCH 096/172] Update pom.xml --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 488588e7..72ec54a7 100644 --- a/pom.xml +++ b/pom.xml @@ -41,16 +41,16 @@
- + - http://35.184.195.6:8081/repository/maven-releases/ + - http://35.184.195.6:8081/repository/maven-snapshots/ + From 1cc21b924a20efefb49c3f824281103a1783e942 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 24 Feb 2020 23:05:13 +0530 Subject: [PATCH 097/172] Update pom.xml --- pom.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 72ec54a7..9f67b88d 100644 --- a/pom.xml +++ b/pom.xml @@ -41,16 +41,5 @@
- - - + From 38fa8ae9e3ca68a8e393fb50459a55d9803fe15a Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 25 Feb 2020 11:17:05 +0530 Subject: [PATCH 098/172] Update pom.xml --- pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f67b88d..598dab4b 100644 --- a/pom.xml +++ b/pom.xml @@ -41,5 +41,16 @@
- + + + releases + + http://34.67.244.240:8081/repository/maven-releases/ + + + snapshots + + http://34.67.244.240:8081/repository/maven-snapshots/ + + From 36e898e482218c481f45b16da51c4f4f1a682912 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 25 Feb 2020 11:20:54 +0530 Subject: [PATCH 099/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 598dab4b..63749afe 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@
- + java-tomcat-maven-example org.apache.maven.plugins From 6266d031a0da49038c859ed0aa21b960b162e4bc Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 25 Feb 2020 11:22:35 +0530 Subject: [PATCH 100/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63749afe..c5c3ca27 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 9.0 + 9.0.1 hello Maven Webapp http://maven.apache.org From 4842b0077315ab55c5b3228caa51d4040a31f075 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 25 Feb 2020 11:31:16 +0530 Subject: [PATCH 101/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c5c3ca27..9e06062f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 9.0.1 + 9.0.1-SNAPSHOT hello Maven Webapp http://maven.apache.org From ca587ffe281ff47973298918a001a9bc879d9ec4 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 10 Mar 2020 23:21:43 +0530 Subject: [PATCH 102/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index a549d8ce..61355f66 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,6 +3,7 @@

added new line

+

added new line 10th march

From eb3cda5bacf7a82cab275f84aeb2d745ae91a9d9 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 14 Mar 2020 11:20:37 +0530 Subject: [PATCH 103/172] Update index.jsp --- src/main/webapp/index.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 61355f66..187e8691 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,8 +2,8 @@ -

added new line

-

added new line 10th march

+

14th march

+ From ad556bd98519ba4f21b9eaed289e84f599b3727c Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Fri, 20 Mar 2020 22:32:50 +0530 Subject: [PATCH 104/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9e06062f..29d429f0 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ releases - http://34.67.244.240:8081/repository/maven-releases/ + http://localhost:8088/repository/maven-releases/ snapshots - http://34.67.244.240:8081/repository/maven-snapshots/ + http://localhost:8088/repository/maven-snapshots/ From d0516230324ac39bfffdceac4b704ce26be03777 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 17 May 2020 23:23:11 +0530 Subject: [PATCH 105/172] Update Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a26a91a9..3883d0d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,11 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://apachemirror.wuchna.com/tomcat/tomcat-8/v8.5.51/bin/apache-tomcat-8.5.51.tar.gz +#RUN curl -O http://apachemirror.wuchna.com/tomcat/tomcat-8/v8.5.51/bin/apache-tomcat-8.5.51.tar.gz +RUN curl -O https://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.55/bin/apache-tomcat-8.5.55.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.51.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.55.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat ADD target/java-tomcat-maven-example.war /opt/tomcat/webapps From c66ec5aea3b6846c7495f3af7ff6ba5b4ad03bb9 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 19 May 2020 08:29:49 +0530 Subject: [PATCH 106/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 187e8691..1062ce04 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,6 +3,7 @@

14th march

+

19th march

From 21d2e354c40aa36aa89337158a06af64a91b943c Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 19 May 2020 08:52:22 +0530 Subject: [PATCH 107/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29d429f0..67b7abb5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 9.0.1-SNAPSHOT + 1.0-SNAPSHOT hello Maven Webapp http://maven.apache.org From 4cd7cfb942dcb026caee75933f2eb1592a745de4 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 19 May 2020 08:55:14 +0530 Subject: [PATCH 108/172] Update index.jsp --- src/main/webapp/index.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 1062ce04..97ec4432 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,10 +1,10 @@ - + <h2> 14th march</h2> <h2> 19th march</h2> - + From 075c61b0b851a4cb497600c786d6407e86389c45 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 12 Aug 2020 20:52:25 +0530 Subject: [PATCH 109/172] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3883d0d0..ca8e4e19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,10 +12,10 @@ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp #RUN curl -O http://apachemirror.wuchna.com/tomcat/tomcat-8/v8.5.51/bin/apache-tomcat-8.5.51.tar.gz -RUN curl -O https://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.55/bin/apache-tomcat-8.5.55.tar.gz +RUN curl -O https://downloads.apache.org/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.55.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.57.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat ADD target/java-tomcat-maven-example.war /opt/tomcat/webapps From ecbf3227f96df5241fe73bb18ccd25407ffc5932 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 12 Aug 2020 20:59:48 +0530 Subject: [PATCH 110/172] Update index.jsp --- src/main/webapp/index.jsp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 97ec4432..379bc20c 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,10 +1,6 @@ - - - - <h2> 14th march</h2> - <h2> 19th march</h2> - + +

Test

From a09959714a77cf67dbed0a7389fbc4cca0b7adfe Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 13 Aug 2020 06:53:53 +0530 Subject: [PATCH 111/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 379bc20c..640aa19b 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,6 +1,7 @@

Test

+

!!!!!!!!!!!!!!!!! Today is 13th Aug !!!!!!!!!!

From 3cebd9ba5598f3a2cfab76236ee830cdeb417660 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 13 Aug 2020 20:45:21 +0530 Subject: [PATCH 112/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 640aa19b..8c6ba79b 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,6 +2,7 @@

Test

!!!!!!!!!!!!!!!!! Today is 13th Aug !!!!!!!!!!

+

!!!!!!!!!!!!!!!!! Today is 13th Aug night !!!!!!!!!!

From 4c723cd282112eeec09011f66c5f93416071b8c2 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 13 Aug 2020 20:50:02 +0530 Subject: [PATCH 113/172] Update index.jsp --- src/main/webapp/index.jsp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 8c6ba79b..50c01064 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,7 +2,9 @@

Test

!!!!!!!!!!!!!!!!! Today is 13th Aug !!!!!!!!!!

-

!!!!!!!!!!!!!!!!! Today is 13th Aug night !!!!!!!!!!

+

!!!!!!!!!!!!!!!!! Today is 13th Aug night !!!!!!!!!!

+

!!!!!!!!!!!!!!!!! Today is 13th Aug night !!!!!!!!!!

+ From 50c2dabd5f34d2637f58a9471476449bb0e67770 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 13 Aug 2020 20:53:55 +0530 Subject: [PATCH 114/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 50c01064..54a88f54 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -4,6 +4,7 @@

!!!!!!!!!!!!!!!!! Today is 13th Aug !!!!!!!!!!

!!!!!!!!!!!!!!!!! Today is 13th Aug night !!!!!!!!!!

!!!!!!!!!!!!!!!!! Today is 13th Aug night !!!!!!!!!!

+

Added to the master

From d09d0bdaabcad1a82f37d521ba278c4f27a3ca56 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 13 Aug 2020 20:54:50 +0530 Subject: [PATCH 115/172] Update index.jsp --- src/main/webapp/index.jsp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 54a88f54..2e07de35 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,10 +1,8 @@ -

Test

-

!!!!!!!!!!!!!!!!! Today is 13th Aug !!!!!!!!!!

-

!!!!!!!!!!!!!!!!! Today is 13th Aug night !!!!!!!!!!

-

!!!!!!!!!!!!!!!!! Today is 13th Aug night !!!!!!!!!!

-

Added to the master

+ +

!!!!!!!!!!!!!!!!! Today is 13th Aug Dev change !!!!!!!!!!

+ From be8b2751259240161ded5ad807d2e5ef982b8dfe Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Aug 2020 22:47:21 +0530 Subject: [PATCH 116/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 67b7abb5..cac6c45d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ releases - http://localhost:8088/repository/maven-releases/ + http://34.68.115.252:8081/repository/maven-releases/ snapshots - http://localhost:8088/repository/maven-snapshots/ + http://34.68.115.252:8081/repository/maven-snapshots/ From e9ba6138e6043cb5cf23c8be5b52180293356104 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Aug 2020 23:01:04 +0530 Subject: [PATCH 117/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cac6c45d..f272e793 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@
- java-tomcat-maven-example + myapp org.apache.maven.plugins From 3682ee422a3976b5d8f3c4b35755586452cb1527 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Aug 2020 23:01:40 +0530 Subject: [PATCH 118/172] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ca8e4e19..1bc9abf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN gzip -V RUN tar -xvzf apache-tomcat-8.5.57.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat -ADD target/java-tomcat-maven-example.war /opt/tomcat/webapps +ADD target/myapp.war /opt/tomcat/webapps #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ #RUN update-java-alternatives -l ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 From 944603271958e9cf05ed3651daad013832dc97e8 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Aug 2020 23:04:58 +0530 Subject: [PATCH 119/172] Update index.jsp --- src/main/webapp/index.jsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 2e07de35..3ac8d70f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,9 +1,9 @@ - -

!!!!!!!!!!!!!!!!! Today is 13th Aug Dev change !!!!!!!!!!

- - + +

Welcome To

+

Live DevOps Project Demonstration by Micronet IT Solutions

+
From 62236bf727bec1a289e2bf308143f1e3e25cb593 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 15 Aug 2020 23:08:11 +0530 Subject: [PATCH 120/172] Update index.jsp --- src/main/webapp/index.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 3ac8d70f..0195a343 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,8 +1,8 @@ -

Welcome To

-

Live DevOps Project Demonstration by Micronet IT Solutions

+

Welcome To

+

Live DevOps Project Demonstration by Micronet IT Solutions

From 24c8539e94334422bb13061528bcad38af40c675 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 16 Aug 2020 20:28:20 +0530 Subject: [PATCH 121/172] Update index.jsp --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 0195a343..9a3c511e 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,6 +3,7 @@

Welcome To

Live DevOps Project Demonstration by Micronet IT Solutions

+

today is16th Aug

From 6984ac0503d374194539b8a8453bfb96551a2a04 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 16 Aug 2020 21:27:28 +0530 Subject: [PATCH 122/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f272e793..003b42f4 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ releases - http://34.68.115.252:8081/repository/maven-releases/ + http://34.121.253.8:8081/repository/maven-releases/ snapshots - http://34.68.115.252:8081/repository/maven-snapshots/ + http://34.121.253.8:8081/repository/maven-snapshots/ From e49756f8499aa85201eeadd8a6a7956a7e90d108 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 16 Aug 2020 21:28:41 +0530 Subject: [PATCH 123/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 003b42f4..235a33c7 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@
- myapp + org.apache.maven.plugins From 88963e0f76311562a84142a74e0f75d8e674c62f Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 16 Aug 2020 21:34:53 +0530 Subject: [PATCH 124/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 235a33c7..0319cb3e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 1.0-SNAPSHOT + 3.0-SNAPSHOT hello Maven Webapp http://maven.apache.org From da610baf41bf703a14aefeccdb39860df9f14f65 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 16 Aug 2020 22:32:05 +0530 Subject: [PATCH 125/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0319cb3e..e6dd4817 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - + java-tomcat-maven-example org.apache.maven.plugins From 8cc9fc082d33a018c3a0bbb6ca88f283e07cfa7a Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 16 Aug 2020 22:36:33 +0530 Subject: [PATCH 126/172] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1bc9abf6..ca8e4e19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN gzip -V RUN tar -xvzf apache-tomcat-8.5.57.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat -ADD target/myapp.war /opt/tomcat/webapps +ADD target/java-tomcat-maven-example.war /opt/tomcat/webapps #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ #RUN update-java-alternatives -l ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 From bbf50eece1d7d6c355fe1f0fce9fffbe06ce9efa Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 17 Aug 2020 21:09:17 +0530 Subject: [PATCH 127/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e6dd4817..b2cb5abf 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ releases - http://34.121.253.8:8081/repository/maven-releases/ + http://34.121.67.200:8081/repository/maven-releases/ snapshots - http://34.121.253.8:8081/repository/maven-snapshots/ + http://34.121.67.200:8081/repository/maven-snapshots/ From c71cfaaf18c9dfb69fd42ab2c0f170b7f30036ec Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 27 Sep 2020 19:26:22 +0530 Subject: [PATCH 128/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2cb5abf..54283d1d 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@
- java-tomcat-maven-example + org.apache.maven.plugins From 4b4d63bb7e7e98cccd943f5bffc7747746a8c410 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 18 Nov 2020 22:51:06 +0530 Subject: [PATCH 129/172] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cefddf07..cb3f3f2c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ //added new line for test pull SCM +//test multibranch # java-tomcat-maven-example #adding devops This is an example ready-to-deploy java web application built for Tomcat using Maven and webapp-runner. From 43b8560b3b3a69ee748754bb2fc9f52d9812dae0 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 18 Nov 2020 22:53:23 +0530 Subject: [PATCH 130/172] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cb3f3f2c..0d7b6ae9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ //added new line for test pull SCM +\\ddd //test multibranch # java-tomcat-maven-example #adding devops From c8d5a6b73a9c2f399e48e0762f34d182797ae1f4 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 18 Nov 2020 22:54:06 +0530 Subject: [PATCH 131/172] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d7b6ae9..15e51a2f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ //added new line for test pull SCM -\\ddd + //test multibranch # java-tomcat-maven-example #adding devops From 1bb20c105eae4bc0b30e12066ef551e32494e530 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 2 Dec 2020 08:34:32 +0530 Subject: [PATCH 132/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 9a3c511e..6d39a23c 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,7 +3,7 @@

Welcome To

Live DevOps Project Demonstration by Micronet IT Solutions

-

today is16th Aug

+

today is 2nd Dec

From 1655e4e8276ff099f1032aba47b527d90d290feb Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Wed, 2 Dec 2020 08:37:59 +0530 Subject: [PATCH 133/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 6d39a23c..45397904 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,7 +2,7 @@

Welcome To

-

Live DevOps Project Demonstration by Micronet IT Solutions

+

Test App

today is 2nd Dec

From b75c4f1af5a2012b081e2943c86b99b6e1ea32dc Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 27 Feb 2021 20:47:49 +0530 Subject: [PATCH 134/172] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 15e51a2f..696b00a8 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ The application will be available on `http://localhost:8080`. 2. Add the webapp-runner plugin into the `pom.xml`: +Test merge ``` From 1c95899366196cefeb604c48d3c28af2007f1cf2 Mon Sep 17 00:00:00 2001 From: csenapati12 Date: Sat, 13 Mar 2021 18:53:49 +0530 Subject: [PATCH 135/172] ansible --- Jenkinsfile | 42 +++++++++++++++++++++++------------------- Jenkinsfile-back | 21 +++++++++++++++++++++ deployfile.yml | 8 ++++++++ 3 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 Jenkinsfile-back create mode 100644 deployfile.yml diff --git a/Jenkinsfile b/Jenkinsfile index bfbce308..823b037d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,21 +1,25 @@ -node(){ -checkout scm - - stage('compile') { - echo "compile" +pipeline { + agent any + stages { + stage('Build and Package') { + steps { + withMaven(maven: 'maven-3.6.3') { + script{ + sh """ + mvn clean package + """ + }} + } } - stage('test') { - echo "test" + stage('Ansible Deploy') { + steps { + script{ + sh """ + ansible --version + ansible-playbook deployfile.yml + """ + } + } } - -stage('Maven Build') { - - } - stage('deploy to nexus') { - echo "deploy" - } - -stage('Docker Build') { - echo "Docker build" - } - } + } +} \ No newline at end of file diff --git a/Jenkinsfile-back b/Jenkinsfile-back new file mode 100644 index 00000000..bfbce308 --- /dev/null +++ b/Jenkinsfile-back @@ -0,0 +1,21 @@ +node(){ +checkout scm + + stage('compile') { + echo "compile" + } + stage('test') { + echo "test" + } + +stage('Maven Build') { + + } + stage('deploy to nexus') { + echo "deploy" + } + +stage('Docker Build') { + echo "Docker build" + } + } diff --git a/deployfile.yml b/deployfile.yml new file mode 100644 index 00000000..fc881703 --- /dev/null +++ b/deployfile.yml @@ -0,0 +1,8 @@ +--- +- hosts: localhost + tasks: + - name: before deployment folder structure + shell: cd /var/lib/jenkins/deploy && ls -la + - name: Copy the playbook + copy: src=/var/lib/jenkins/workspace/ansible-deploy/target/*.war dest=/home/skylab_priyadarshini/tomcat8/webapps + From 3304879588c262b26406bd1cd6850faf40fb16ec Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 13 Mar 2021 18:56:03 +0530 Subject: [PATCH 136/172] Update deployfile.yml --- deployfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployfile.yml b/deployfile.yml index fc881703..8808ed33 100644 --- a/deployfile.yml +++ b/deployfile.yml @@ -4,5 +4,5 @@ - name: before deployment folder structure shell: cd /var/lib/jenkins/deploy && ls -la - name: Copy the playbook - copy: src=/var/lib/jenkins/workspace/ansible-deploy/target/*.war dest=/home/skylab_priyadarshini/tomcat8/webapps + copy: src=/var/lib/jenkins/workspace/ansible-pipleline/target/*.war dest=/home/skylab_priyadarshini/tomcat8/webapps From 37faf193e72b64630b24db170ce36ac7f7c4e1bd Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 13 Mar 2021 18:59:43 +0530 Subject: [PATCH 137/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54283d1d..8c3e467d 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@
- + myapp org.apache.maven.plugins From 429a6082ed2b5f63794baf41ff5d85845ec30028 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 13 Mar 2021 19:00:00 +0530 Subject: [PATCH 138/172] Update deployfile.yml --- deployfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployfile.yml b/deployfile.yml index 8808ed33..67e41570 100644 --- a/deployfile.yml +++ b/deployfile.yml @@ -4,5 +4,5 @@ - name: before deployment folder structure shell: cd /var/lib/jenkins/deploy && ls -la - name: Copy the playbook - copy: src=/var/lib/jenkins/workspace/ansible-pipleline/target/*.war dest=/home/skylab_priyadarshini/tomcat8/webapps + copy: src=/var/lib/jenkins/workspace/ansible-pipleline/target/myapp.war dest=/home/skylab_priyadarshini/tomcat8/webapps From cbeb620702fa0bdaca2d6408571ddc52d9861d0b Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sat, 13 Mar 2021 19:10:54 +0530 Subject: [PATCH 139/172] Update deployfile.yml --- deployfile.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deployfile.yml b/deployfile.yml index 67e41570..62ab68a4 100644 --- a/deployfile.yml +++ b/deployfile.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + become: true + become_user: root tasks: - name: before deployment folder structure shell: cd /var/lib/jenkins/deploy && ls -la From 4d1bb324ed7c706cdea970047c3715ff6d7d7074 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 14 Mar 2021 05:34:52 +0530 Subject: [PATCH 140/172] Update Jenkinsfile --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 823b037d..8b73ca44 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,12 +3,13 @@ pipeline { stages { stage('Build and Package') { steps { - withMaven(maven: 'maven-3.6.3') { + // withMaven(maven: 'maven-3.6.3') { script{ sh """ mvn clean package """ - }} + } + //} } } stage('Ansible Deploy') { @@ -22,4 +23,4 @@ pipeline { } } } -} \ No newline at end of file +} From b9e26bb6395bbd2fc51d2b76f1f7bb06f30cb10d Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 14 Mar 2021 06:02:05 +0530 Subject: [PATCH 141/172] Update deployfile.yml --- deployfile.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deployfile.yml b/deployfile.yml index 62ab68a4..15ff8045 100644 --- a/deployfile.yml +++ b/deployfile.yml @@ -2,9 +2,7 @@ - hosts: localhost become: true become_user: root - tasks: - - name: before deployment folder structure - shell: cd /var/lib/jenkins/deploy && ls -la + tasks: - name: Copy the playbook copy: src=/var/lib/jenkins/workspace/ansible-pipleline/target/myapp.war dest=/home/skylab_priyadarshini/tomcat8/webapps From 6387745992259139e4158d89646576c52460609a Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 14 Mar 2021 06:03:28 +0530 Subject: [PATCH 142/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 45397904..b804d8f3 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,7 +3,7 @@

Welcome To

Test App

-

today is 2nd Dec

+

today is 14th march

From c9e933618727a2c5ccabb44f1eb28685c30532e2 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 14 Mar 2021 06:11:12 +0530 Subject: [PATCH 143/172] Update Jenkinsfile --- Jenkinsfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8b73ca44..b8f89ccb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,15 @@ pipeline { agent any + parameters { + gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'BRANCH', type: 'PT_BRANCH' + } stages { + stage('Checkout') { + steps { + git branch: "${params.BRANCH}", url: 'https://github.com/csenapati12/java-tomcat-maven-docker.git' + + } + } stage('Build and Package') { steps { // withMaven(maven: 'maven-3.6.3') { From d7f61b9685cb2bb128de1bc3a286366185b54882 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 14 Mar 2021 22:45:24 +0530 Subject: [PATCH 144/172] Create deploytomcat.yml --- deploytomcat.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 deploytomcat.yml diff --git a/deploytomcat.yml b/deploytomcat.yml new file mode 100644 index 00000000..5fa6dd34 --- /dev/null +++ b/deploytomcat.yml @@ -0,0 +1,7 @@ +--- +- hosts: deploy-tomcat + become: true + become_user: root + tasks: + - name: Copy the artifact + copy: src=/var/lib/jenkins/workspace/ansible-pipleline/target/myapp.war dest=/home/tomcat/apache-tomcat-8.5.64/webapps From 80e3415ad7f825d246b5093fe7e9d2cb637447d4 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 14 Mar 2021 22:59:27 +0530 Subject: [PATCH 145/172] Create Jenkinsfile-latest --- Jenkinsfile-latest | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Jenkinsfile-latest diff --git a/Jenkinsfile-latest b/Jenkinsfile-latest new file mode 100644 index 00000000..c43b1284 --- /dev/null +++ b/Jenkinsfile-latest @@ -0,0 +1,25 @@ +pipeline{ + agent any + stages{ + stage("checkout"){ + steps{ + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/csenapati12/java-tomcat-maven-docker.git']]] + } + } + stage("Build and packaging"){ + steps{ + sh """ + mvn clean package + """ + } + } + stage("Deploy tomcat"){ + steps{ + script{ + ansiblePlaybook credentialsId: 'root-credentials', playbook: 'deploytomcat.yml' + } + } + } + } + +} From 68b8ab46ccc5c861d77b540f22b5c14b5b05e3eb Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 14 Mar 2021 23:00:01 +0530 Subject: [PATCH 146/172] Create ansible-hosts --- ansible-hosts | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ansible-hosts diff --git a/ansible-hosts b/ansible-hosts new file mode 100644 index 00000000..1603d1c8 --- /dev/null +++ b/ansible-hosts @@ -0,0 +1,3 @@ +[deploy-tomcat] +#34.122.68.73 +130.211.221.35 From b46a0d85fce4317d9599244fadf8beafb3668a44 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 14 Mar 2021 23:01:19 +0530 Subject: [PATCH 147/172] Update Jenkinsfile-latest --- Jenkinsfile-latest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-latest b/Jenkinsfile-latest index c43b1284..3adb3dfb 100644 --- a/Jenkinsfile-latest +++ b/Jenkinsfile-latest @@ -16,7 +16,7 @@ pipeline{ stage("Deploy tomcat"){ steps{ script{ - ansiblePlaybook credentialsId: 'root-credentials', playbook: 'deploytomcat.yml' + ansiblePlaybook credentialsId: 'root-credentials', inventory: 'ansible-hosts', playbook: 'deploytomcat.yml' } } } From bfdc833da06be5ac4d55959420a2d29a545e399c Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 14 Mar 2021 23:02:51 +0530 Subject: [PATCH 148/172] Update ansible-hosts --- ansible-hosts | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible-hosts b/ansible-hosts index 1603d1c8..d385e974 100644 --- a/ansible-hosts +++ b/ansible-hosts @@ -1,3 +1,4 @@ [deploy-tomcat] #34.122.68.73 +35.238.183.82 130.211.221.35 From c84683b3452ed7473e38eeaaf43f80d4f8ea15be Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 4 Apr 2021 08:49:08 +0530 Subject: [PATCH 149/172] Update Dockerfile --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca8e4e19..fd36342c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,22 +6,21 @@ RUN apt-get update && \ add-apt-repository ppa:webupd8team/java -y && \ apt-get update && \ echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ - apt-get install -y openjdk-8-jdk && \ + apt-get install -y oracle-java8-installer && \ apt-get clean RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -#RUN curl -O http://apachemirror.wuchna.com/tomcat/tomcat-8/v8.5.51/bin/apache-tomcat-8.5.51.tar.gz -RUN curl -O https://downloads.apache.org/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.tar.gz +RUN curl -O http://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.39/bin/apache-tomcat-8.5.39.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.57.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.39.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat -ADD target/java-tomcat-maven-example.war /opt/tomcat/webapps +COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ #RUN update-java-alternatives -l -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle Run cd /opt/tomcat/bin expose 8080 #CMD /opt/tomcat/bin/catalina.sh run && tail -f /opt/tomcat/logs/catalina.out From 6620cdc3cb5e6bc17d9177c17a9dd0fe869a8f32 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 4 Apr 2021 08:56:47 +0530 Subject: [PATCH 150/172] Update Dockerfile --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd36342c..215c91c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,21 +6,21 @@ RUN apt-get update && \ add-apt-repository ppa:webupd8team/java -y && \ apt-get update && \ echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ - apt-get install -y oracle-java8-installer && \ + apt-get install -y openjdk-8-jdk && \ apt-get clean RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O http://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.39/bin/apache-tomcat-8.5.39.tar.gz +RUN curl -O https://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.64/bin/apache-tomcat-8.5.64.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.39.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.64.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat -COPY target/java-tomcat-maven-example.war /opt/tomcat/webapps +ADD target/java-tomcat-maven-example.war /opt/tomcat/webapps #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ #RUN update-java-alternatives -l -ENV JAVA_HOME /usr/lib/jvm/java-8-oracle +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 Run cd /opt/tomcat/bin expose 8080 #CMD /opt/tomcat/bin/catalina.sh run && tail -f /opt/tomcat/logs/catalina.out From 6785f5aeed0535df04739cdaac7c6096b5701e1e Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 4 Apr 2021 08:57:21 +0530 Subject: [PATCH 151/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index b804d8f3..85797c26 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,7 +3,7 @@

Welcome To

Test App

-

today is 14th march

+

My docker demo on 4th april

From 64bb3827a6bff8d859ab7a335e5dfbbe74c25521 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 30 May 2021 19:14:44 +0530 Subject: [PATCH 152/172] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 215c91c2..e6322687 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O https://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.64/bin/apache-tomcat-8.5.64.tar.gz +RUN curl -O https://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.66/bin/apache-tomcat-8.5.66.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.64.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.66.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat ADD target/java-tomcat-maven-example.war /opt/tomcat/webapps From 04461f6d633ff8f2a3fd3177304159b3e9865b4e Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 30 May 2021 19:21:57 +0530 Subject: [PATCH 153/172] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e6322687..7c4f1ecf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN gzip -V RUN tar -xvzf apache-tomcat-8.5.66.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat -ADD target/java-tomcat-maven-example.war /opt/tomcat/webapps +ADD target/myapp.war /opt/tomcat/webapps #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ #RUN update-java-alternatives -l ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 From 7f1d4089a06072530265b6266e8bc487cf7a0922 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 13 Jun 2021 22:09:14 +0530 Subject: [PATCH 154/172] Update Jenkinsfile --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b8f89ccb..7955297a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,8 +15,10 @@ pipeline { // withMaven(maven: 'maven-3.6.3') { script{ sh """ - mvn clean package - """ + // mvn clean package + echo "MAster" + ls -la + """ } //} } From 4376cd957b9638929cbd18760144ebad66e78ecd Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 13 Jun 2021 22:11:08 +0530 Subject: [PATCH 155/172] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7955297a..3ee55234 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,8 @@ pipeline { // withMaven(maven: 'maven-3.6.3') { script{ sh """ - // mvn clean package + ls + # mvn clean package echo "MAster" ls -la """ From 58cff9142155fefc043deff2ba77a6ebe6b7a4b7 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 14 Jun 2021 20:52:42 +0530 Subject: [PATCH 156/172] Update Jenkinsfile --- Jenkinsfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3ee55234..6d2f7ab5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,10 @@ pipeline { - agent any + node { label "$NODE" }} parameters { - gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'BRANCH', type: 'PT_BRANCH' + // gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'BRANCH', type: 'PT_BRANCH' + // parameters { string(name: 'NODE', defaultValue: 'some_node', description: '') } + gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'BRANCH', type: 'PT_BRANCH',string(name: 'NODE', defaultValue: 'master', description: '') + } stages { stage('Checkout') { From c35297cbeb15cdea08e5fab306bd28f523e3a1d0 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 14 Jun 2021 20:55:51 +0530 Subject: [PATCH 157/172] Update Jenkinsfile --- Jenkinsfile | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6d2f7ab5..e1c3c83e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - node { label "$NODE" }} + node { label "$NODE" } parameters { // gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'BRANCH', type: 'PT_BRANCH' // parameters { string(name: 'NODE', defaultValue: 'some_node', description: '') } @@ -15,7 +15,7 @@ pipeline { } stage('Build and Package') { steps { - // withMaven(maven: 'maven-3.6.3') { + script{ sh """ ls @@ -24,18 +24,9 @@ pipeline { ls -la """ } - //} - } - } - stage('Ansible Deploy') { - steps { - script{ - sh """ - ansible --version - ansible-playbook deployfile.yml - """ - } + } } + } } From d38d847130647d00db3e628e3cf7e6e046706242 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 14 Jun 2021 20:56:50 +0530 Subject: [PATCH 158/172] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e1c3c83e..dca0c64c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - node { label "$NODE" } + agent{ label "$NODE" } parameters { // gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'BRANCH', type: 'PT_BRANCH' // parameters { string(name: 'NODE', defaultValue: 'some_node', description: '') } From e6d071df38644f453ba8608bd24c4a600b6f15b3 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Mon, 26 Jul 2021 10:02:33 +0530 Subject: [PATCH 159/172] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7c4f1ecf..15c5273b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ RUN apt-get update && \ RUN groupadd tomcat RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat RUN cd /tmp -RUN curl -O https://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.66/bin/apache-tomcat-8.5.66.tar.gz +RUN curl -O https://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.69/bin/apache-tomcat-8.5.69.tar.gz RUN mkdir /opt/tomcat RUN gzip -V -RUN tar -xvzf apache-tomcat-8.5.66.tar.gz -C /opt/tomcat --strip-components=1 +RUN tar -xvzf apache-tomcat-8.5.69.tar.gz -C /opt/tomcat --strip-components=1 RUN cd /opt/tomcat RUN chgrp -R tomcat /opt/tomcat ADD target/myapp.war /opt/tomcat/webapps From 0fa78f9250ba41b069e621c2397b625bbe3fcdb8 Mon Sep 17 00:00:00 2001 From: csenapati12 Date: Tue, 27 Jul 2021 22:58:50 +0530 Subject: [PATCH 160/172] Revert "Update Jenkinsfile" This reverts commit d38d847130647d00db3e628e3cf7e6e046706242. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dca0c64c..e1c3c83e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent{ label "$NODE" } + node { label "$NODE" } parameters { // gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'BRANCH', type: 'PT_BRANCH' // parameters { string(name: 'NODE', defaultValue: 'some_node', description: '') } From 41ed03bfe21fbc0bf799b3033c4682236a00ac70 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 5 Aug 2021 10:09:20 +0530 Subject: [PATCH 161/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 85797c26..05e985cc 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,7 +3,7 @@

Welcome To

Test App

-

My docker demo on 4th april

+

5th Aug

From 829325fc0f9c421788c285fc0856ab85afe32b5a Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 5 Aug 2021 10:13:35 +0530 Subject: [PATCH 162/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 05e985cc..f029cc4d 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,7 +3,7 @@

Welcome To

Test App

-

5th Aug

+

!!!!!!!!!!!!!!!!!!5th Aug !!!!!!!!!!!!!!!!!!!!!!!!

From ec3d6db4a45706be0e3b0156a1b62f9c49a56ce8 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 5 Aug 2021 10:18:43 +0530 Subject: [PATCH 163/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8c3e467d..6c83793f 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ releases - http://34.121.67.200:8081/repository/maven-releases/ + http://104.154.180.19/:8081/repository/maven-releases/ snapshots - http://34.121.67.200:8081/repository/maven-snapshots/ + http://104.154.180.19/repository/maven-snapshots/ From 7fc2f1a6ac47d17aa660a79540a957fe1d66689a Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 5 Aug 2021 10:19:54 +0530 Subject: [PATCH 164/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6c83793f..03a4b21a 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ releases - http://104.154.180.19/:8081/repository/maven-releases/ + http://104.154.180.19:8081/repository/maven-releases/ snapshots - http://104.154.180.19/repository/maven-snapshots/ + http://104.154.180.19:8081/repository/maven-snapshots/ From d4113ed4cff05e438f7698f503073e10c67f135a Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 5 Aug 2021 10:27:01 +0530 Subject: [PATCH 165/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03a4b21a..93a94cfe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 3.0-SNAPSHOT + 5.0-SNAPSHOT hello Maven Webapp http://maven.apache.org From 5e0c4324ccdfdb8bdf5ac73fa32dc9e1df6676f1 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Thu, 5 Aug 2021 10:28:12 +0530 Subject: [PATCH 166/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93a94cfe..4c377154 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 5.0-SNAPSHOT + 5.0.1 hello Maven Webapp http://maven.apache.org From 5f238bdad8e2eb630a924b4b5c3c9d5881d45879 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 15 Aug 2021 19:37:12 +0530 Subject: [PATCH 167/172] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4c377154..842ac0ab 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ releases - http://104.154.180.19:8081/repository/maven-releases/ + http://34.133.198.104:8081/repository/maven-releases/ snapshots - http://104.154.180.19:8081/repository/maven-snapshots/ + http://34.133.198.104:8081/repository/maven-snapshots/ From 37ece562cffc9d4d4ef41016889c394501bc7b19 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 15 Aug 2021 19:38:35 +0530 Subject: [PATCH 168/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 842ac0ab..089225e2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.example java-tomcat-maven-example war - 5.0.1 + 5.0.1-SNAPSHOTS hello Maven Webapp http://maven.apache.org From 3a4dcb46a513895e05ded12cec2b5f7e232aae7c Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 15 Aug 2021 21:22:24 +0530 Subject: [PATCH 169/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 089225e2..f9cdca8b 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - myapp + org.apache.maven.plugins From 43f5929d5c3f6307ea8ae6ced1a4685ab8805cf8 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 15 Aug 2021 21:54:50 +0530 Subject: [PATCH 170/172] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index f029cc4d..eb7ca2a1 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,7 +3,7 @@

Welcome To

Test App

-

!!!!!!!!!!!!!!!!!!5th Aug !!!!!!!!!!!!!!!!!!!!!!!!

+

!!!!!!!!!!!!!!!!!!15th Aug ?????????!!!!!!!!!!!!!!!!!!!!!!!!

From 2295672a156f9946c7e5d3c2afd66b46dc004728 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Sun, 15 Aug 2021 22:05:27 +0530 Subject: [PATCH 171/172] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f9cdca8b..089225e2 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@
- + myapp org.apache.maven.plugins From def1bb841e6350bedb36e3131f11480f2eb74038 Mon Sep 17 00:00:00 2001 From: Chaitanya Senapati Date: Tue, 22 Feb 2022 19:16:29 +0530 Subject: [PATCH 172/172] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 696b00a8..df1fe709 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ //added new line for test pull SCM - +//added new line for test pull SCM--->22ndfeb //test multibranch # java-tomcat-maven-example #adding devops