diff --git a/Jenkinsfile b/Jenkinsfile index 8ab231999..45e3321f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,13 +32,13 @@ pipeline { options { timeout(time: 30, unit: 'MINUTES') } environment { - DOCKER_HUB = credentials('hub.docker.com-springbuildmaster') - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + DOCKER_HUB = credentials("${p['docker.credentials']}") + ARTIFACTORY = credentials("${p['artifactory.credentials']}") } steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) { sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" sh 'PROFILE=none ci/verify.sh' @@ -63,7 +63,7 @@ pipeline { options { timeout(time: 20, unit: 'MINUTES') } environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + ARTIFACTORY = credentials("${p['artifactory.credentials']}") } steps {