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 696730348..fb0775e8c 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 06170c82d..1da368caa 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 87997180c6b388734fb4379a1e43d24ff4dec78e Mon Sep 17 00:00:00 2001 From: 0606deepak <110587279+0606deepak@users.noreply.github.com> Date: Thu, 1 Dec 2022 16:35:35 +0530 Subject: [PATCH 3/5] Second commit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1da368caa..65b395e32 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM tomcat:latest +FROM tomcat:8.0.27-jre8 # Dummy text to test COPY target/java-web-app*.war /usr/local/tomcat/webapps/java-web-app.war From 6905d2e75667888f5155d0af7b60fdc163f8d11e Mon Sep 17 00:00:00 2001 From: 0606deepak <110587279+0606deepak@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:40:07 +0530 Subject: [PATCH 4/5] Update jenkinsfile confiq Update jenkinsfile confiq --- Jenkinsfile | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 286b31a22..edc171ba8 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,38 +3,34 @@ 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-3.5.6", type: "maven" +stage(" Maven Clean Package"){ + def mavenHome = tool name: "Maven-3.9.6", type: "maven" def mavenCMD = "${mavenHome}/bin/mvn" sh "${mavenCMD} clean package" - } - + } - stage('Build Docker Image'){ - sh 'docker build -t dockerhandson/java-web-app .' - } + stage('Build Docker Image'){ + sh 'docker build -t jeedeepak/java-web-app .' + } - stage('Push Docker Image'){ +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 login -u jeedeepak -p ${Docker_Hub_Pwd}" } - sh 'docker push dockerhandson/java-web-app' - } - - stage('Run Docker Image In Dev Server'){ + sh 'docker push jeedeepak/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}" + def dockerRun = ' docker run -d -p 8080:8080 --name java-web-app jeedeepak/java-web-app' + + sshagent(['Docker_ssh-password']) { + sh 'ssh -o StrictHostKeyChecking=no ubuntu@35.154.98.111 docker stop java-web-app || true' + sh 'ssh ubuntu@35.154.98.111 docker rm java-web-app || true' + sh 'ssh ubuntu@35.154.98.111 docker rmi -f $(docker images -q) || true' + sh "ssh ubuntu@35.154.98.111 ${dockerRun}" } } - } From e2ad5a35e8f120ff72b90f3d2ad7763a9ea0d2bd Mon Sep 17 00:00:00 2001 From: 0606deepak <110587279+0606deepak@users.noreply.github.com> Date: Mon, 10 Jun 2024 22:33:06 +0530 Subject: [PATCH 5/5] Update Dockerfile1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 65b395e32..947ada121 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ FROM tomcat:8.0.27-jre8 -# Dummy text to test +# Dummy text to test 1 COPY target/java-web-app*.war /usr/local/tomcat/webapps/java-web-app.war