From f9ba3e336f61e9b5ca734b1155eeca21f1742689 Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Fri, 28 Jun 2019 17:22:17 +0200
Subject: [PATCH] OSB-45: wrong variable usage
---
LCU/Maintenance/Docker/Jenkinsfile | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/LCU/Maintenance/Docker/Jenkinsfile b/LCU/Maintenance/Docker/Jenkinsfile
index b2ccb1ff5f2..0b036998cd3 100644
--- a/LCU/Maintenance/Docker/Jenkinsfile
+++ b/LCU/Maintenance/Docker/Jenkinsfile
@@ -11,27 +11,12 @@ pipeline {
label 'bob'
}
steps {
-
echo 'building tag ${env.DOCKER_TAG}'
-
- script {
- dir ('LCU/Maintenance/Docker/BaseMaintenance/'){
- docker.build "lofar-maintenance-base:${env.DOCKER_TAG}"
- }
-
- docker.build("lofar-maintenance-dbinterface:${env.DOCKER_TAG}", "--build-arg TAG=${DOCKER_TAG}")
-
- dir ('LCU/Maintenance/Docker/RESTService/'){
- docker.build("lofar-maintenance-restservice:${env.DOCKER_TAG}", "--build-arg TAG=${DOCKER_TAG}")
- }
-
- dir ('LCU/Maintenance/Docker/RESTService/'){
- docker.build("lofar-maintenance-nginxproxy:${env.DOCKER_TAG}", "--build-arg TAG=${DOCKER_TAG}")
- }
- dir ('LCU/Maintenance/Docker/BackgroundWorkers'){
- docker.build("lofar-maintenance-backgroundworkers:${env.DOCKER_TAG}", "--build-arg TAG=${DOCKER_TAG}")
- }
- }
+ docker.build "lofar-maintenance-base:${env.DOCKER_TAG} LCU/Maintenance/Docker/BaseMaintenance/"
+ docker.build "lofar-maintenance-dbinterface:${env.DOCKER_TAG} --build-arg TAG=${DOCKER_TAG} -f LCU/Maintenance/Docker/DBInterface/Dockerfile"
+ docker.build "lofar-maintenance-restservice:${env.DOCKER_TAG} --build-arg TAG=${DOCKER_TAG}"
+ docker.build "lofar-maintenance-nginxproxy:${env.DOCKER_TAG} --build-arg TAG=${DOCKER_TAG} LCU/Maintenance/Docker/RESTService/"
+ docker.build "lofar-maintenance-backgroundworkers:${env.DOCKER_TAG} --build-arg TAG=${DOCKER_TAG} LCU/Maintenance/Docker/BackgroundWorkers"
}
}
stage('Test') {
--
GitLab