From 8b37908746c2f9286c4facf6c313d2e004a7ddd2 Mon Sep 17 00:00:00 2001 From: sandeepdurai <63720732+sandeepdurai@users.noreply.github.com> Date: Tue, 19 May 2020 19:05:30 +0530 Subject: [PATCH 1/5] update --- src/main/webapp/WEB-INF/views/jsp/index.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/jsp/index.jsp b/src/main/webapp/WEB-INF/views/jsp/index.jsp index 69673034..fb0775e8 100755 --- a/src/main/webapp/WEB-INF/views/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/views/jsp/index.jsp @@ -40,15 +40,15 @@
-

Welcome To Mithun Technologies, Marathahalli, Banglore.

-

Contact @ +91-8296242028 ,+91-9980923226

+

Welcome To cloudcandy.

+

Contact @ +91-9597361516

From f8c34a4acaaf530ea3b3ae15a2c557df5d6137a8 Mon Sep 17 00:00:00 2001 From: sandeepdurai <63720732+sandeepdurai@users.noreply.github.com> Date: Tue, 19 May 2020 21:44:34 +0530 Subject: [PATCH 2/5] update --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 06170c82..1da368ca 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM tomcat:8.0.20-jre8 +FROM tomcat:latest # Dummy text to test -COPY target/java-web-app*.war /usr/local/tomcat/webapps/java-web-app.war \ No newline at end of file +COPY target/java-web-app*.war /usr/local/tomcat/webapps/java-web-app.war From 6e6dadbdfff2dbed75f1ce842a688e495abdc2b5 Mon Sep 17 00:00:00 2001 From: Vinothaws <100070903+Vinothaws@users.noreply.github.com> Date: Sun, 20 Feb 2022 16:05:27 +0530 Subject: [PATCH 3/5] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1da368ca..daf3646e 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM tomcat:latest +FROM tomcat:8 # Dummy text to test COPY target/java-web-app*.war /usr/local/tomcat/webapps/java-web-app.war From c6544f92470220ca73fa315d3e019bd58c2b33ca Mon Sep 17 00:00:00 2001 From: Vinothaws <100070903+Vinothaws@users.noreply.github.com> Date: Fri, 25 Nov 2022 12:11:44 +0530 Subject: [PATCH 4/5] Update Jenkinsfile --- Jenkinsfile | 53 +++++++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 286b31a2..e4bdcbc2 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,40 +1,29 @@ -node{ - - stage('SCM Checkout'){ - git url: 'https://github.com/MithunTechnologiesDevOps/java-web-app-docker.git',branch: 'master' +node +{ + def buildNumber = BUILD_NUMBER + stage("Git CheckOut"){ + git url: 'https://github.com/vinothaws/java-web-app-docker.git',branch: 'master' } stage(" Maven Clean Package"){ - def mavenHome = tool name: "Maven-3.5.6", type: "maven" + def mavenHome = tool name: "Maven", type: "maven" def mavenCMD = "${mavenHome}/bin/mvn" sh "${mavenCMD} clean package" - } - - - stage('Build Docker Image'){ - sh 'docker build -t dockerhandson/java-web-app .' - } - - stage('Push Docker Image'){ - withCredentials([string(credentialsId: 'Docker_Hub_Pwd', variable: 'Docker_Hub_Pwd')]) { - sh "docker login -u dockerhandson -p ${Docker_Hub_Pwd}" - } - sh 'docker push dockerhandson/java-web-app' - } - - stage('Run Docker Image In Dev Server'){ - - def dockerRun = ' docker run -d -p 8080:8080 --name java-web-app dockerhandson/java-web-app' - - sshagent(['DOCKER_SERVER']) { - sh 'ssh -o StrictHostKeyChecking=no ubuntu@172.31.20.72 docker stop java-web-app || true' - sh 'ssh ubuntu@172.31.20.72 docker rm java-web-app || true' - sh 'ssh ubuntu@172.31.20.72 docker rmi -f $(docker images -q) || true' - sh "ssh ubuntu@172.31.20.72 ${dockerRun}" - } - + stage("Build Dokcer Image") { + sh "docker build -t vinothaws/java-web-app-docker:${buildNumber} ." + } + stage("Docker login and Push"){ + withCredentials([string(credentialsId: 'docker', variable: 'docker')]) { + sh "docker login -u vinothaws -p ${docker} " + } + sh "docker push vinothaws/java-web-app-docker:${buildNumber}" } - - + stage("Deploy to dockercontinor in docker deployer"){ + sshagent(['Docker-dev-ssh']) { + sh "ssh -o StrictHostKeyChecking=no ubuntu@172.31.15.107 docker rm -f my1stproject22 || true" + sh "ssh -o StrictHostKeyChecking=no ubuntu@172.31.15.107 docker run -d -p 8080:8080 --name my1stproject vinothaws/java-web-app-docker:${buildNumber}" + } +} + } From 1a198329896a324fa329b685bb2d329a17b130d5 Mon Sep 17 00:00:00 2001 From: Vinothaws <100070903+Vinothaws@users.noreply.github.com> Date: Fri, 25 Nov 2022 12:47:40 +0530 Subject: [PATCH 5/5] Revert "Update Jenkinsfile" --- Jenkinsfile | 53 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e4bdcbc2..286b31a2 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,29 +1,40 @@ -node -{ - def buildNumber = BUILD_NUMBER - stage("Git CheckOut"){ - git url: 'https://github.com/vinothaws/java-web-app-docker.git',branch: 'master' +node{ + + stage('SCM Checkout'){ + git url: 'https://github.com/MithunTechnologiesDevOps/java-web-app-docker.git',branch: 'master' } stage(" Maven Clean Package"){ - def mavenHome = tool name: "Maven", type: "maven" + def mavenHome = tool name: "Maven-3.5.6", type: "maven" def mavenCMD = "${mavenHome}/bin/mvn" sh "${mavenCMD} clean package" + } - stage("Build Dokcer Image") { - sh "docker build -t vinothaws/java-web-app-docker:${buildNumber} ." - } - stage("Docker login and Push"){ - withCredentials([string(credentialsId: 'docker', variable: 'docker')]) { - sh "docker login -u vinothaws -p ${docker} " - } - sh "docker push vinothaws/java-web-app-docker:${buildNumber}" + + + stage('Build Docker Image'){ + sh 'docker build -t dockerhandson/java-web-app .' } - stage("Deploy to dockercontinor in docker deployer"){ - sshagent(['Docker-dev-ssh']) { - sh "ssh -o StrictHostKeyChecking=no ubuntu@172.31.15.107 docker rm -f my1stproject22 || true" - sh "ssh -o StrictHostKeyChecking=no ubuntu@172.31.15.107 docker run -d -p 8080:8080 --name my1stproject vinothaws/java-web-app-docker:${buildNumber}" - } -} - + + stage('Push Docker Image'){ + withCredentials([string(credentialsId: 'Docker_Hub_Pwd', variable: 'Docker_Hub_Pwd')]) { + sh "docker login -u dockerhandson -p ${Docker_Hub_Pwd}" + } + sh 'docker push dockerhandson/java-web-app' + } + + stage('Run Docker Image In Dev Server'){ + + def dockerRun = ' docker run -d -p 8080:8080 --name java-web-app dockerhandson/java-web-app' + + sshagent(['DOCKER_SERVER']) { + sh 'ssh -o StrictHostKeyChecking=no ubuntu@172.31.20.72 docker stop java-web-app || true' + sh 'ssh ubuntu@172.31.20.72 docker rm java-web-app || true' + sh 'ssh ubuntu@172.31.20.72 docker rmi -f $(docker images -q) || true' + sh "ssh ubuntu@172.31.20.72 ${dockerRun}" + } + + } + + }