improve the jenkins setup

xebialabs · Feb 1, 2019 · 86169d5 · 86169d5
1 parent c84c346
commit 86169d5
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 6 deletions.
diff --git a/app.png b/app.png
diff --git a/docker-compose/xebialabs/jenkins/jenkins.yaml b/docker-compose/xebialabs/jenkins/jenkins.yaml
@@ -12,7 +12,7 @@ jobs:
                           branch("master")
                           remote {
                             credentials('github-credentials')
-                            url('https://github.com/<your-github-username>/e-commerce-microservice.git')
+                            url('https://github.com/${GITHUB_USER}/e-commerce-microservice.git')
                           }
                       }
                   }
@@ -29,7 +29,7 @@ jobs:
                           branch("master")
                           remote {
                         	credentials('github-credentials')
-                        	url('https://github.com/<your-github-username>/e-commerce-microservice.git')
+                        	url('https://github.com/${GITHUB_USER}/e-commerce-microservice.git')
                           }
                       }
                   }
@@ -46,7 +46,7 @@ jobs:
                           branch("master")
                           remote {
                           credentials('github-credentials')
-                          url('https://github.com/<your-github-username>/e-commerce-microservice.git')
+                          url('https://github.com/${GITHUB_USER}/e-commerce-microservice.git')
                           }
                       }
                   }

diff --git a/docker-compose/xebialabs/xl-deploy/Dockerfile b/docker-compose/xebialabs/xl-deploy/Dockerfile
@@ -2,3 +2,10 @@ FROM xebialabsunsupported/xl-deploy:8.5.0
 
 COPY default-conf/* /opt/xebialabs/xl-deploy-server/default-conf/
 
+# workarounds for latest fixes
+
+RUN rm -f /opt/xebialabs/xl-deploy-server/lib/provision-8.5.0.jar
+COPY lib/provision-8.6.0-SNAPSHOT.jar /opt/xebialabs/xl-deploy-server/lib/
+
+RUN rm -f /opt/xebialabs/xl-deploy-server/default-plugins/xld-aws-plugin-*.xldp
+COPY lib/xld-aws-plugin-8.5.1-SNAPSHOT.xldp /opt/xebialabs/xl-deploy-server/default-plugins/
diff --git a/docker-compose/xebialabs/xl-deploy/lib/provision-8.6.0-SNAPSHOT.jar b/docker-compose/xebialabs/xl-deploy/lib/provision-8.6.0-SNAPSHOT.jar
diff --git a/docker-compose/xebialabs/xl-deploy/lib/xld-aws-plugin-8.5.1-SNAPSHOT.xldp b/docker-compose/xebialabs/xl-deploy/lib/xld-aws-plugin-8.5.1-SNAPSHOT.xldp
diff --git a/invoice/Jenkinsfile b/invoice/Jenkinsfile
@@ -53,7 +53,7 @@ pipeline {
                     stage ("build docker") {
                         sh "cp -R invoice/src/main/docker invoice/build/"
                         sh "cp invoice/build/libs/*.war invoice/build/docker/"
-                        dockerImage = docker.build('<your-dockerhub-user>/ecommerce-invoice', 'invoice/build/docker')
+                        dockerImage = docker.build("${env.DOCKER_USER}/ecommerce-invoice", 'invoice/build/docker')
                     }
                     stage ("publish docker") {
                         docker.withRegistry('https://index.docker.io/v1/', 'docker-login') {

diff --git a/invoice/invoice.png b/invoice/invoice.png
diff --git a/notification/Jenkinsfile b/notification/Jenkinsfile
@@ -53,7 +53,7 @@ pipeline {
                     stage ("build docker") {
                         sh "cp -R notification/src/main/docker notification/build/"
                         sh "cp notification/build/libs/*.war notification/build/docker/"
-                        dockerImage = docker.build('<your-dockerhub-user>/ecommerce-notification', 'notification/build/docker')
+                        dockerImage = docker.build("${env.DOCKER_USER}/ecommerce-notification", 'notification/build/docker')
                     }
                     stage ("publish docker") {
                         docker.withRegistry('https://index.docker.io/v1/', 'docker-login') {

diff --git a/notification/notification.png b/notification/notification.png
diff --git a/store/Jenkinsfile b/store/Jenkinsfile
@@ -72,7 +72,7 @@ pipeline {
                     stage ("build docker") {
                         sh "cp -R store/src/main/docker store/build/"
                         sh "cp store/build/libs/*.war store/build/docker/"
-                        dockerImage = docker.build('<your-dockerhub-user>/ecommerce-store', 'store/build/docker')
+                        dockerImage = docker.build("${env.DOCKER_USER}/ecommerce-store", 'store/build/docker')
                     }
                     stage ("publish docker") {
                         docker.withRegistry('https://index.docker.io/v1/', 'docker-login') {

diff --git a/store/store.png b/store/store.png