From 8b1d4c12a63647d085005ee1c398437bf0399d1a Mon Sep 17 00:00:00 2001 From: Richard Morgan Date: Sat, 3 Nov 2018 09:17:18 -0400 Subject: [PATCH] add dockerfile building for prometheus to jenkinsfile --- dockerfiles/services/prometheus/Jenkinsfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dockerfiles/services/prometheus/Jenkinsfile b/dockerfiles/services/prometheus/Jenkinsfile index c0f44c6..bb126c2 100644 --- a/dockerfiles/services/prometheus/Jenkinsfile +++ b/dockerfiles/services/prometheus/Jenkinsfile @@ -2,6 +2,8 @@ node('docker') { def service_name = 'metrics' def app_name = 'prometheus' def workdir = 'dockerfiles/services/prometheus' + def build_file = 'docker-compose.yml' + def deployment_file = 'docker-compose-prod.yml' stage('prepare') { git credentialsId: 'f1f58215-c789-44a2-9b72-50e4425cb061', url: 'ssh://git@git.xai-corp.net:10022/xai-corp.net/provisioning.git' @@ -10,14 +12,18 @@ node('docker') { stage('build') { dir(workdir) { - sh "DOCKER_HOST=dkhost:2376 docker-compose -f docker-compose.yml pull" + docker.withRegistry('http://dkregistry.xai-corp.net:5000') { + def customImage = docker.build("dkregistry.xai-corp.net:5000/${app_name}:latest", "-f ${build_file} .") + customImage.push() + } + sh "docker-compose -f ${build_file} pull" } } stage('deploy') { dir(workdir) { sh """ - docker stack deploy -c docker-compose.yml ${service_name} + docker stack deploy -c ${deployment_file} ${service_name} docker service update -q ${service_name}_${app_name} """ }