diff --git a/LCU/Maintenance/Docker/Jenkinsfile b/LCU/Maintenance/Docker/Jenkinsfile index b2ccb1ff5f2df0565186b4ef2eff45e1dc521b97..0b036998cd334232f30fbcb63ddf4e51ed35288f 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') {