From e65b913b223cd879c20971ad21e70fc7cb7cb952 Mon Sep 17 00:00:00 2001 From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com> Date: Fri, 28 Mar 2025 17:13:10 +0530 Subject: [PATCH 01/21] Delete Dockerfile --- Dockerfile | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 88fe618..0000000 --- a/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM tomcat:8.0 - -ADD ./target/*.war /usr/local/tomcat/webapps/ - -EXPOSE 8080 - -WORKDIR /usr/local/tomcat/webapps/ - -CMD ["catalina.sh", "run"] - From f0f9cbbb8ba17b31b554a0fbfcf98a44d6fecfe4 Mon Sep 17 00:00:00 2001 From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com> Date: Fri, 28 Mar 2025 17:13:41 +0530 Subject: [PATCH 02/21] Delete Jenkinsfile --- Jenkinsfile | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index f722447..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,34 +0,0 @@ -pipeline { - agent any - - tools { - maven 'local_maven' - } - parameters { - string(name: 'staging_server', defaultValue: '13.232.37.20', description: 'Remote Staging Server') - } - -stages{ - stage('Build'){ - steps { - sh 'mvn clean package' - } - post { - success { - echo 'Archiving the artifacts' - archiveArtifacts artifacts: '**/target/*.war' - } - } - } - - stage ('Deployments'){ - parallel{ - stage ("Deploy to Staging"){ - steps { - sh "scp -v -o StrictHostKeyChecking=no **/*.war root@${params.staging_server}:/opt/tomcat/webapps/" - } - } - } - } - } -} From 11d68e1750fda5421e93e4ff9e47ca4665b4c1e2 Mon Sep 17 00:00:00 2001 From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com> Date: Fri, 28 Mar 2025 17:14:05 +0530 Subject: [PATCH 03/21] Delete Jenkinsfile_1.0 --- Jenkinsfile_1.0 | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 Jenkinsfile_1.0 diff --git a/Jenkinsfile_1.0 b/Jenkinsfile_1.0 deleted file mode 100644 index d030fb6..0000000 --- a/Jenkinsfile_1.0 +++ /dev/null @@ -1,45 +0,0 @@ -pipeline { - agent any - - tools { - maven 'localMaven' - } - parameters { - string(name: 'tomcat_stag', defaultValue: '13.59.108.184', description: 'Node1-Remote Staging Server') - string(name: 'tomcat_prod', defaultValue: '18.219.228.98', description: 'Node2-Remote Production Server') - } - - triggers { - pollSCM('* * * * *') - } - -stages{ - stage('Build'){ - steps { - sh 'mvn clean package' - } - post { - success { - echo 'Archiving the artifacts' - archiveArtifacts artifacts: '**/target/*.war' - } - } - } - - stage ('Deployments'){ - parallel{ - stage ('Deploy to Staging'){ - steps { - sh "scp **/*.war jenkins@${params.tomcat_stag}:/usr/share/tomcat/webapps/" - } - } - - stage ("Deploy to Production"){ - steps { - sh "scp **/*.war jenkins@${params.tomcat_prod}:/usr/share/tomcat/webapps/" - } - } - } - } - } -} From 083947bad0c2d3b20e981903e12267e1ddfa7dcd Mon Sep 17 00:00:00 2001 From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com> Date: Fri, 28 Mar 2025 17:14:33 +0530 Subject: [PATCH 04/21] Delete Jenkinsfile_Docker_Local --- Jenkinsfile_Docker_Local | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 Jenkinsfile_Docker_Local diff --git a/Jenkinsfile_Docker_Local b/Jenkinsfile_Docker_Local deleted file mode 100644 index 7f7c1cc..0000000 --- a/Jenkinsfile_Docker_Local +++ /dev/null @@ -1,14 +0,0 @@ -pipeline{ - agent any - tools { - maven 'localMaven' - } - stages{ - stage('Build'){ - steps{ - sh 'mvn clean package' - sh "docker build . -t tomcatwebapp:${env.BUILD_ID}" - } - } - } -} From 0baf6f8dd58a1f62f2c910b64449e1abbbbb099f Mon Sep 17 00:00:00 2001 From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com> Date: Fri, 28 Mar 2025 17:14:56 +0530 Subject: [PATCH 05/21] Delete Jenkinsfile_Docker_Remote --- Jenkinsfile_Docker_Remote | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 Jenkinsfile_Docker_Remote diff --git a/Jenkinsfile_Docker_Remote b/Jenkinsfile_Docker_Remote deleted file mode 100644 index cf138a7..0000000 --- a/Jenkinsfile_Docker_Remote +++ /dev/null @@ -1,15 +0,0 @@ -pipeline{ - agent any - tools { - maven 'localMaven' - } - stages{ - stage('Build'){ - steps{ - sh 'mvn clean package' - sh 'scp Dockerfile centos@3.17.61.170' - sh 'ssh centos@3.17.61.170 "docker build . -t tomcatwebapp:${env.BUILD_ID}"' - } - } - } -} From dfedd422cec2a283427bb34d4f49f9716aebbf17 Mon Sep 17 00:00:00 2001 From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com> Date: Tue, 1 Apr 2025 20:36:06 +0530 Subject: [PATCH 06/21] Create Jenkinsfile --- Jenkinsfile | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..93d1481 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,33 @@ +pipeline { + agent any + + tools { + maven 'localMaven' + jdk 'localJava' + } + environment { + fname = "Ranjit" + lname = "Swain" + version = "1.2" + system = "Test" + } + +stages{ + stage('Build'){ + steps { + sh 'mvn clean package' + } + post { + success { + echo 'Archiving the artifacts' + archiveArtifacts artifacts: '**/target/*.war' + } + } + } + stage ('Deploy to Staging1'){ + steps { + echo 'This is just a demo on Staging1 server.' + } + } + } +} From 3bf1d762558bb51805a9030cadbde4266def066d Mon Sep 17 00:00:00 2001 From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com> Date: Tue, 1 Apr 2025 20:59:16 +0530 Subject: [PATCH 07/21] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 93d1481..97debee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,9 +24,9 @@ stages{ } } } - stage ('Deploy to Staging1'){ + stage ('Deploy to Staging'){ steps { - echo 'This is just a demo on Staging1 server.' + echo 'This is just a demo on Staging server.' } } } From 680d2b8327608691b155d71cddfbb864f35991b7 Mon Sep 17 00:00:00 2001 From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com> Date: Tue, 1 Apr 2025 21:16:20 +0530 Subject: [PATCH 08/21] Update template.xhtml --- src/main/webapp/template.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml index 8151566..efd6a0f 100644 --- a/src/main/webapp/template.xhtml +++ b/src/main/webapp/template.xhtml @@ -11,7 +11,7 @@