[checkmk-commits] pull latest master image before building od-nodes

Module: check_mk Branch: master Commit: 2525e23029f6af72e1acf5b5fd08daae423a3087 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2525e23029f6af… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 5 11:49:58 2019 +0100 pull latest master image before building od-nodes Change-Id: I93ea68496cbdcddd5364d3fa5bb4e941d451b168 --- buildscripts/scripts/os-nodes.jenkins | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/buildscripts/scripts/os-nodes.jenkins b/buildscripts/scripts/os-nodes.jenkins index 1aba9f3..b04dd90 100644 --- a/buildscripts/scripts/os-nodes.jenkins +++ b/buildscripts/scripts/os-nodes.jenkins @@ -13,7 +13,10 @@ currentBuild.description = currentBuild.description + '\nBuilding for the follow def DOCKER_BUILDS = [:] node { - docker.image(DOCKER_REGISTRY + '/ubuntu-18.04-common').inside('-u 0:0 --cap-add=SYS_ADMIN --network infrastructure_local-infra') { + docker.withRegistry(DOCKER_REGISTRY, 'nexus') { + IMAGE = 'ubuntu-18.04-common' + docker.image(IMAGE).pull() + docker.image(IMAGE).inside('-u 0:0 --cap-add=SYS_ADMIN --network infrastructure_local-infra') { stage('checkout sources') { cleanWs() checkout(scm) @@ -26,7 +29,9 @@ node { DISTRO_LIST.each { DISTRO -> DOCKER_BUILDS[DISTRO] = { node { - docker.image(DOCKER_REGISTRY + '/ubuntu-18.04-common').inside('-u 0:0 -v /var/run/docker.sock:/var/run/docker.sock --cap-add=SYS_ADMIN --network ci_local-infra') { + docker.withRegistry(DOCKER_REGISTRY, 'nexus') { + IMAGE = 'ubuntu-18.04-common' + docker.image(IMAGE).inside('-u 0:0 -v /var/run/docker.sock:/var/run/docker.sock --cap-add=SYS_ADMIN --network ci_local-infra') { stage('build ' + DISTRO + ' os-image') { unstash name: 'dockerfiles' unstash name: 'distroinfos'