From 2d70c74ad2434fcc2d069b3b776ce6fe4f99b1e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 21:30:30 +0100 Subject: [PATCH 01/15] Add dockerfile --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..b3c334ce2 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:8-alpine + +COPY target/spring-petclinic-2.0.0.jar /opt/spring-petclinic.jar + +EXPOSE 8080 + +CMD java -Djava.security.egd=file:/dev/./urandom -jar /opt/spring-petclinic.jar \ No newline at end of file From 91e6ee71d5de9611b366a85cbb24cd5cde5485c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:03:31 +0100 Subject: [PATCH 02/15] Jenkinsfile v1 --- Jenkinsfile | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..1e6ac6996 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,33 @@ +pipeline { + + agent any + + options { + // Keep only 1 artifact, and many builds + buildDiscarder(logRotator(numToKeepStr: '1000', artifactNumToKeepStr: '0')) + } + + stages { + + stage('Build the code') { + agent { + docker { + image 'openjdk:8-jdk-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + steps { + sh './mvnw clean package' + } + } + + stage('Create image') { + steps { + sh 'docker build --pull -t loxon/petclinic:2.0.0 .' + sh 'docker push loxon/petclinic:2.0.0' + } + } + + } + +} \ No newline at end of file From 4cd9b6eccec10b93ebd03c786f6bc20fc73b17f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:16:01 +0100 Subject: [PATCH 03/15] Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1e6ac6996..e8610fc2a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,11 +13,11 @@ pipeline { agent { docker { image 'openjdk:8-jdk-alpine' - args '-v $HOME/.m2:/root/.m2' + args '-v /var/jenkins_home/.m2:/root/.m2' } } steps { - sh './mvnw clean package' + sh './mvnw clean package -DskipTests' } } From 249aaf1f17cdd78f0823209f68c6a3aa4f9bc797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:18:11 +0100 Subject: [PATCH 04/15] Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index e8610fc2a..b8abb4a5e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,6 +23,7 @@ pipeline { stage('Create image') { steps { + sh 'pwd' sh 'docker build --pull -t loxon/petclinic:2.0.0 .' sh 'docker push loxon/petclinic:2.0.0' } From b993997c6543d273617379d7d09831b705daea64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:20:10 +0100 Subject: [PATCH 05/15] Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index b8abb4a5e..d6a2512a4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,6 +24,7 @@ pipeline { stage('Create image') { steps { sh 'pwd' + sh 'ls -la' sh 'docker build --pull -t loxon/petclinic:2.0.0 .' sh 'docker push loxon/petclinic:2.0.0' } From 406396fedee1f292f971f39f9f6e5e35f9bcf46a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:21:50 +0100 Subject: [PATCH 06/15] Jenkinsfile --- Jenkinsfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6a2512a4..67257e138 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,11 +18,6 @@ pipeline { } steps { sh './mvnw clean package -DskipTests' - } - } - - stage('Create image') { - steps { sh 'pwd' sh 'ls -la' sh 'docker build --pull -t loxon/petclinic:2.0.0 .' From ad24d4ee279419dc7061201bdc3c8af05c2df426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:25:13 +0100 Subject: [PATCH 07/15] Jenkinsfile --- Jenkinsfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 67257e138..518635499 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,13 +10,16 @@ pipeline { stages { stage('Build the code') { - agent { - docker { - image 'openjdk:8-jdk-alpine' - args '-v /var/jenkins_home/.m2:/root/.m2' - } - } steps { + script { + def buildContainer = docker.image('docker.loxon.eu/infra/angularcli:alpine').withRun('-v /var/jenkins_home/.m2:/root/.m2') + buildContainer.pull() + buildContainer.inside { + sh ''' + ./mvnw clean package -DskipTests + ''' + } + } sh './mvnw clean package -DskipTests' sh 'pwd' sh 'ls -la' From 98af15d42eebf7df1e4a6d2ff184a039329941d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:27:49 +0100 Subject: [PATCH 08/15] Jenkinsfile --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 518635499..aab07407a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,9 +12,7 @@ pipeline { stage('Build the code') { steps { script { - def buildContainer = docker.image('docker.loxon.eu/infra/angularcli:alpine').withRun('-v /var/jenkins_home/.m2:/root/.m2') - buildContainer.pull() - buildContainer.inside { + docker.image('openjdk:8-jdk-alpine').inside('-v /var/jenkins_home/.m2:/root/.m2') { sh ''' ./mvnw clean package -DskipTests ''' From 0065df70310dd0d22063704c13b6fb11b641e7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:32:02 +0100 Subject: [PATCH 09/15] Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index aab07407a..278c2c8b1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { script { docker.image('openjdk:8-jdk-alpine').inside('-v /var/jenkins_home/.m2:/root/.m2') { sh ''' - ./mvnw clean package -DskipTests + ./mvnw clean package -DskipTests -T 2C ''' } } From 31b3e2e60080f848f8c5318c92014241cb962e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:33:18 +0100 Subject: [PATCH 10/15] Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 278c2c8b1..c8cc63e3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { script { docker.image('openjdk:8-jdk-alpine').inside('-v /var/jenkins_home/.m2:/root/.m2') { sh ''' - ./mvnw clean package -DskipTests -T 2C + ./mvnw clean package -DskipTests -T 2 ''' } } From 752f8d8103433bb473486c8668ec9926cf2d359a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:44:40 +0100 Subject: [PATCH 11/15] Jenkinsfile --- Jenkinsfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8cc63e3d..7a66d0ee3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,12 +17,10 @@ pipeline { ./mvnw clean package -DskipTests -T 2 ''' } + + docker.build("loxon/petclinic:2.0.0").push() } - sh './mvnw clean package -DskipTests' - sh 'pwd' - sh 'ls -la' - sh 'docker build --pull -t loxon/petclinic:2.0.0 .' - sh 'docker push loxon/petclinic:2.0.0' + } } From 8aff9e977ed6d24aed63edcab8b35b571352befb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 22:55:40 +0100 Subject: [PATCH 12/15] Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7a66d0ee3..3c09e5c81 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { stage('Build the code') { steps { script { - docker.image('openjdk:8-jdk-alpine').inside('-v /var/jenkins_home/.m2:/root/.m2') { + docker.image('openjdk:8-jdk-alpine').inside('-v /tmp/.m2:/root/.m2') { sh ''' ./mvnw clean package -DskipTests -T 2 ''' From 3f928b677f84e17c9a203ef5cee5935f932a89e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 23:00:45 +0100 Subject: [PATCH 13/15] Jenkinsfile --- Jenkinsfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3c09e5c81..f5c8c42ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,13 +17,19 @@ pipeline { ./mvnw clean package -DskipTests -T 2 ''' } - - docker.build("loxon/petclinic:2.0.0").push() } } } + stage('Build the image') { + steps { + script { + docker.build("loxon/petclinic:2.0.0").push() + } + } + } + } } \ No newline at end of file From 2f32de5a8d1b75bbb7bef6b1e16dafc91c3ad37b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 23:05:20 +0100 Subject: [PATCH 14/15] Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f5c8c42ff..4c2ccd0de 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { stage('Build the code') { steps { script { - docker.image('openjdk:8-jdk-alpine').inside('-v /tmp/.m2:/root/.m2') { + docker.image('openjdk:8-jdk-alpine').inside('-v /var/jenkins_home/.m2:/root/.m2') { sh ''' ./mvnw clean package -DskipTests -T 2 ''' From 7ead370d23bb31288a6b1d8e974b0b277508eb63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= Date: Mon, 29 Jan 2018 23:20:07 +0100 Subject: [PATCH 15/15] Test request --- test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 000000000..e69de29bb