From 9166c1ec4e0bdd7c040da6a7de03e783be3291ff Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:40:56 +0530 Subject: [PATCH 01/14] Update README.md Last edited by Rjoshi --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 38a78cde..706ca765 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ This is a Sample Maven App. +Last edited by rjoshi@adobe.com From b70b9f79d3e55604b5e18ef8a15c70e2f2ceb8ba Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Thu, 28 Sep 2023 12:16:34 +0530 Subject: [PATCH 02/14] Create Jenkinsfile Create Jenkinsfile --- Jenkinsfile | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..40536c90 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,29 @@ +pipeline{ + + agent any + + tools{ + maven 'Maven 3.6.3' + } + + stages{ + stage('build'){ + steps{ + echo 'compile maven app' + sh 'mvn compile' + } + } + stage('test'){ + steps{ + echo 'test maven app' + sh 'mvn clean test' + } + } + stage('package'){ + steps{ + echo 'package maven app' + sh 'mvn package -DskipTests' + } + } + } +} From 398843374f18b80d81056e2876bca39be670013f Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Thu, 28 Sep 2023 12:44:56 +0530 Subject: [PATCH 03/14] Archive Artifacts --- Jenkinsfile | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 40536c90..d77d8981 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,29 +1,30 @@ -pipeline{ - +pipeline { agent any - - tools{ - maven 'Maven 3.6.3' - } - - stages{ - stage('build'){ - steps{ + stages { + stage('build') { + steps { echo 'compile maven app' sh 'mvn compile' } } - stage('test'){ - steps{ + + stage('test') { + steps { echo 'test maven app' sh 'mvn clean test' } } - stage('package'){ - steps{ + + stage('package') { + steps { echo 'package maven app' sh 'mvn package -DskipTests' + archiveArtifacts 'target/*.war' } } + + } + tools { + maven 'Maven 3.6.3' } -} +} \ No newline at end of file From 4a15b714307ad302d6fb6c47a0d1ab22e62d0414 Mon Sep 17 00:00:00 2001 From: Rahul Joshi Date: Fri, 29 Sep 2023 11:52:07 +0530 Subject: [PATCH 04/14] added sample line --- test.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 test.md diff --git a/test.md b/test.md new file mode 100644 index 00000000..93895959 --- /dev/null +++ b/test.md @@ -0,0 +1,2 @@ +New line +:wq! From c1d1182a326e48ebe6dd3456eb61b2583399e88a Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:53:42 +0530 Subject: [PATCH 05/14] Adding docker --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d77d8981..985392f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,10 @@ pipeline { - agent any + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } stages { stage('build') { steps { From b22996ca0172cf07f9058b77c6262ebae43aa537 Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Wed, 4 Oct 2023 09:28:10 +0530 Subject: [PATCH 06/14] Create Dockerfile --- Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..903c7da7 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM maven:3.6.3-jdk-11-slim as build +WORKDIR /opt/demo +COPY . /opt/demo +RUN mvn package -DskipTests + +FROM tomcat:jre8-openjdk-slim-buster as run +WORKDIR /usr/local/tomcat +COPY --from=build /opt/demo/target/sysfoo.war webapps/ROOT.war From 9b3a190640dd1aa9974f51bdb8d976f319ef3ecf Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Wed, 4 Oct 2023 09:46:59 +0530 Subject: [PATCH 07/14] Docker build stage --- Jenkinsfile | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 985392f5..bff70267 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,12 +1,13 @@ pipeline { - agent { - docker { - image 'maven:3.6.3-jdk-11-slim' - } - - } + agent none stages { stage('build') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'compile maven app' sh 'mvn compile' @@ -14,6 +15,12 @@ pipeline { } stage('test') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'test maven app' sh 'mvn clean test' @@ -21,6 +28,12 @@ pipeline { } stage('package') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'package maven app' sh 'mvn package -DskipTests' From 5d84f55ab1d439bcd9c7c5bc2204f769c0ebb8f3 Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:20:24 +0530 Subject: [PATCH 08/14] docker build and publish --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index bff70267..a11666b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,6 +41,21 @@ pipeline { } } + stage('Docker Build and Publish') { + agent any + steps { + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { + def dockerImage = docker.build("rjoshiadb/sysfoo:v${env.BUILD_ID}", "./") + dockerImage.push() + dockerImage.push("latest") + dockerImage.push("dev") + } + } + + } + } + } tools { maven 'Maven 3.6.3' From 53b9908517f8e79a366ebb12863171a03878c560 Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:32:25 +0530 Subject: [PATCH 09/14] Upgrade Version Upgrade Version --- 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 f441d8d6..a95b2cdc 100755 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -30,7 +30,7 @@
-

version 0.0.2

+

version 1.0.0

SYSTEM INFO

<% out.println(request.getLocalAddr()); %>

From 60fba409e5cbaf14133f119c87ee5f6914eedc21 Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:49:05 +0530 Subject: [PATCH 10/14] Parallel Pack and BnP --- Jenkinsfile | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a11666b4..77bb8e70 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,34 +28,45 @@ pipeline { } stage('package') { - agent { - docker { - image 'maven:3.6.3-jdk-11-slim' + parallel { + stage('package') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } + steps { + echo 'package maven app' + sh 'mvn package -DskipTests' + archiveArtifacts 'target/*.war' + } } - } - steps { - echo 'package maven app' - sh 'mvn package -DskipTests' - archiveArtifacts 'target/*.war' - } - } + stage('Docker BnP') { + agent any + steps { + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { + def dockerImage = docker.build("rjoshiadb/sysfoo:v${env.BUILD_ID}", "./") + dockerImage.push() + dockerImage.push("latest") + dockerImage.push("dev") + } + } - stage('Docker Build and Publish') { - agent any - steps { - script { - docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { - def dockerImage = docker.build("rjoshiadb/sysfoo:v${env.BUILD_ID}", "./") - dockerImage.push() - dockerImage.push("latest") - dockerImage.push("dev") } } } } + stage('Sleep') { + steps { + sleep 2 + } + } + } tools { maven 'Maven 3.6.3' From 124acd16c3e08bd25cf6e678026f23382ddff807 Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:53:48 +0530 Subject: [PATCH 11/14] Run only on master --- Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 77bb8e70..b327e1a9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,6 +36,9 @@ pipeline { } } + when { + branch 'master' + } steps { echo 'package maven app' sh 'mvn package -DskipTests' @@ -45,6 +48,9 @@ pipeline { stage('Docker BnP') { agent any + when { + branch 'master' + } steps { script { docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { @@ -71,4 +77,4 @@ pipeline { tools { maven 'Maven 3.6.3' } -} \ No newline at end of file +} From 5bf6e7179e3dd49919ca25e46e84ef73603deefe Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:40:23 +0530 Subject: [PATCH 12/14] Create docker-compose.yaml Create docker-compose.yaml --- docker-compose.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 00000000..309dc348 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,7 @@ +version: "3.8" + +services: + sysfoo: + image: rjoshiadb/sysfoo:dev + ports: + - 8888:8080 From f3b192a6d9139dcb991edcb799bc2775df4e26a2 Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:43:07 +0530 Subject: [PATCH 13/14] Run docker-compose --- Jenkinsfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b327e1a9..562ca22f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,6 +67,13 @@ pipeline { } } + stage('Deploy to Dev') { + agent any + steps { + sh 'docker-compose up -d' + } + } + stage('Sleep') { steps { sleep 2 @@ -77,4 +84,4 @@ pipeline { tools { maven 'Maven 3.6.3' } -} +} \ No newline at end of file From 8d594e6bc91b1b80e39d4ce005112529d789adf7 Mon Sep 17 00:00:00 2001 From: rjoshi1906 <60874154+rjoshi1906@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:44:17 +0530 Subject: [PATCH 14/14] Execute deploy to dev only on master Execute deploy to dev only on master --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 562ca22f..ab7162cc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,6 +69,9 @@ pipeline { stage('Deploy to Dev') { agent any + when { + branch 'master' + } steps { sh 'docker-compose up -d' } @@ -84,4 +87,4 @@ pipeline { tools { maven 'Maven 3.6.3' } -} \ No newline at end of file +}