Skip to content

Commit 77e2daa

Browse files
committed
Polishing.
Extract docker credentials into properties file. See #73
1 parent d4a9b5c commit 77e2daa

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Jenkinsfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ pipeline {
3838

3939
steps {
4040
script {
41-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
42-
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
41+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
42+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
4343
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -B -U'
4444
}
4545
}
@@ -66,8 +66,8 @@ pipeline {
6666

6767
steps {
6868
script {
69-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
70-
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
69+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
70+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
7171
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Partifactory ' +
7272
'-Dartifactory.server=https://repo.spring.io ' +
7373
"-Dartifactory.username=${ARTIFACTORY_USR} " +

ci/pipeline.properties

+4
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ docker.cassandra.3.version=3.11.10
2222
# Docker environment settings
2323
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
2424
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
25+
26+
# Credentials
27+
docker.registry=
28+
docker.credentials=hub.docker.com-springbuildmaster

0 commit comments

Comments
 (0)