diff --git a/Dockerfile b/Dockerfile index 06170c82d..947ada121 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM tomcat:8.0.20-jre8 -# Dummy text to test -COPY target/java-web-app*.war /usr/local/tomcat/webapps/java-web-app.war \ No newline at end of file +FROM tomcat:8.0.27-jre8 +# Dummy text to test 1 +COPY target/java-web-app*.war /usr/local/tomcat/webapps/java-web-app.war 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}" } } - } 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 @@