diff --git a/Jenkinsfile b/Jenkinsfile index daf06f7..7691cc3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,8 +38,8 @@ pipeline { steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { + docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -B -U' } } @@ -66,8 +66,8 @@ pipeline { steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { + docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Partifactory ' + '-Dartifactory.server=https://repo.spring.io ' + "-Dartifactory.username=${ARTIFACTORY_USR} " + diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 5d91102..51b0767 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -22,3 +22,7 @@ docker.cassandra.3.version=3.11.10 # Docker environment settings docker.java.inside.basic=-v $HOME:/tmp/jenkins-home docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home + +# Credentials +docker.registry= +docker.credentials=hub.docker.com-springbuildmaster