From d0021309abed4fbcea17549657b116566861c2bb Mon Sep 17 00:00:00 2001 From: MD Imran Date: Thu, 21 Oct 2021 15:55:08 +0530 Subject: [PATCH 01/12] added multi stage Dockerfile to build sysfoo app --- Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..3d873fce --- /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 -D skipTests + +FROM tomcat as run +WORKDIR /usr/local/tomcat +COPY --from=build /opt/demo/target/sysfoo.war webapps/root.war \ No newline at end of file From 9ebaa99202ace5549d1c4834f67fb25c8edebe80 Mon Sep 17 00:00:00 2001 From: imran1108 Date: Thu, 21 Oct 2021 16:37:41 +0530 Subject: [PATCH 02/12] Added Jenkinsfile --- Jenkinsfile | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d77d8981..bff70267 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,13 @@ pipeline { - agent any + agent none stages { stage('build') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'compile maven app' sh 'mvn compile' @@ -9,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' @@ -16,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 f5f655cdbb46eacb3d98ea83d177ba136f9cdf02 Mon Sep 17 00:00:00 2001 From: imran1108 Date: Thu, 21 Oct 2021 16:45:27 +0530 Subject: [PATCH 03/12] Added Jenkinsfile --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index bff70267..dfab5aef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,6 +41,21 @@ pipeline { } } + stage('Docker BnP') { + agent any + steps { + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { + def dockerImage = docker.build("imran1108/sysfoo:v${env.BUILD_ID}", "./") + dockerImage.push() + dockerImage.push("latest") + dockerImage.push("dev") + } + } + + } + } + } tools { maven 'Maven 3.6.3' From 57b21437636a364f98842c7721e4421ba6225356 Mon Sep 17 00:00:00 2001 From: imran1108 Date: Thu, 21 Oct 2021 16:52:18 +0530 Subject: [PATCH 04/12] yes --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dfab5aef..3c5f1c62 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ pipeline { agent any steps { script { - docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { + docker.withRegistry('https://index.docker.io/v1/', 'imran1108') { def dockerImage = docker.build("imran1108/sysfoo:v${env.BUILD_ID}", "./") dockerImage.push() dockerImage.push("latest") From 4510455f18c314db72f6ecd4a276ab16f7af7f5d Mon Sep 17 00:00:00 2001 From: imran1108 Date: Thu, 21 Oct 2021 17:02:38 +0530 Subject: [PATCH 05/12] Added Jenkinsfile --- Jenkinsfile | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3c5f1c62..cc6ee15c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,28 +28,33 @@ 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/', 'imran1108') { + def dockerImage = docker.build("imran1108/sysfoo:v${env.BUILD_ID}", "./") + dockerImage.push() + dockerImage.push("latest") + dockerImage.push("dev") + } + } - stage('Docker BnP') { - agent any - steps { - script { - docker.withRegistry('https://index.docker.io/v1/', 'imran1108') { - def dockerImage = docker.build("imran1108/sysfoo:v${env.BUILD_ID}", "./") - dockerImage.push() - dockerImage.push("latest") - dockerImage.push("dev") } } From 16a72eb5dfeb671d1599a4c2643df78467911bcd Mon Sep 17 00:00:00 2001 From: imran1108 Date: Fri, 22 Oct 2021 10:29:56 +0530 Subject: [PATCH 06/12] Update Jenkinsfile --- Jenkinsfile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cc6ee15c..df3348b3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { sh 'mvn compile' } } - + stage('test') { agent { docker { @@ -26,6 +26,20 @@ pipeline { sh 'mvn clean test' } } + + stage('Deploy to Dev') { + when { + beforeAgent true + branch 'master' + } + + agent any + + steps { + echo 'Deploying to Dev Environment with Docker Compose' + sh 'docker-compose up -d' + } + } stage('package') { parallel { @@ -65,4 +79,4 @@ pipeline { tools { maven 'Maven 3.6.3' } -} \ No newline at end of file +} From ee21ad1324b12aafd680da2e7b48ebf78fe7b676 Mon Sep 17 00:00:00 2001 From: imran1108 Date: Fri, 22 Oct 2021 10:41:46 +0530 Subject: [PATCH 07/12] Delete jenkinsfile --- jenkinsfile | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 jenkinsfile diff --git a/jenkinsfile b/jenkinsfile deleted file mode 100644 index 491866c3..00000000 --- a/jenkinsfile +++ /dev/null @@ -1,30 +0,0 @@ -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 8278370e4e226791f871302d6bccd35be479b57e Mon Sep 17 00:00:00 2001 From: imran1108 Date: Fri, 22 Oct 2021 10:44:12 +0530 Subject: [PATCH 08/12] 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..f58c3295 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,7 @@ +version: "3.8" + +services: +sysfoo: +image: imran1108/sysfoo:latest +ports: +- 8888:8080 From 1810ef6989d61f57563a6109a8a1c3a625b49ba7 Mon Sep 17 00:00:00 2001 From: imran1108 Date: Fri, 22 Oct 2021 10:52:45 +0530 Subject: [PATCH 09/12] Update Jenkinsfile --- Jenkinsfile | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index df3348b3..5ae1bdf9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,20 +27,7 @@ pipeline { } } - stage('Deploy to Dev') { - when { - beforeAgent true - branch 'master' - } - - agent any - - steps { - echo 'Deploying to Dev Environment with Docker Compose' - sh 'docker-compose up -d' - } - } - + stage('package') { parallel { stage('package') { @@ -72,6 +59,20 @@ pipeline { } } + stage('Deploy to Dev') { + when { + beforeAgent true + branch 'master' + } + + agent any + + steps { + echo 'Deploying to Dev Environment with Docker Compose' + sh 'docker-compose up -d' + } + } + } } From ddcaf20bc4a715b31c2c1e82cba373fd7216f8b8 Mon Sep 17 00:00:00 2001 From: imran1108 Date: Fri, 22 Oct 2021 11:07:26 +0530 Subject: [PATCH 10/12] Update Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5ae1bdf9..fca0d91b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,9 @@ pipeline { } } - stage('Deploy to Dev') { + } + + stage('Deploy to Dev') { when { beforeAgent true branch 'master' @@ -72,8 +74,6 @@ pipeline { sh 'docker-compose up -d' } } - - } } } From 135435287b1d12ad603522356e6eb7ff3bddd1ae Mon Sep 17 00:00:00 2001 From: imran1108 Date: Fri, 22 Oct 2021 11:11:06 +0530 Subject: [PATCH 11/12] Update Jenkinsfile --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fca0d91b..a039350b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -61,7 +61,10 @@ pipeline { } - stage('Deploy to Dev') { + + } + + stage('Deploy to Dev') { when { beforeAgent true branch 'master' @@ -74,8 +77,6 @@ pipeline { sh 'docker-compose up -d' } } - } - } tools { maven 'Maven 3.6.3' From f89d561b9384190951d174ec008436a5cd93713b Mon Sep 17 00:00:00 2001 From: imran1108 Date: Fri, 22 Oct 2021 11:14:45 +0530 Subject: [PATCH 12/12] Update Jenkinsfile --- Jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a039350b..a9087c54 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -61,10 +61,7 @@ pipeline { } - - } - - stage('Deploy to Dev') { + stage('Deploy to Dev') { when { beforeAgent true branch 'master' @@ -77,6 +74,10 @@ pipeline { sh 'docker-compose up -d' } } + + } + + } tools { maven 'Maven 3.6.3'