Skip to content

Commit 5f1f970

Browse files
committed
Polishing.
Extract docker credentials into properties file. See #417
1 parent f39e79f commit 5f1f970

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pipeline {
3535
}
3636
steps {
3737
script {
38-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
38+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
3939
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
4040
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
4141
}
@@ -63,7 +63,7 @@ pipeline {
6363

6464
steps {
6565
script {
66-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
66+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
6767
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
6868
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
6969
'-Dartifactory.server=https://repo.spring.io ' +

ci/pipeline.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ docker.java.lts.image=eclipse-temurin:${java.lts.tag}
1212
docker.mongodb.4.0.version=4.0.23
1313
docker.mongodb.4.4.version=4.4.4
1414
docker.mongodb.5.0.version=5.0.3
15-
1615
# Supported versions of Redis
1716
docker.redis.6.version=6.2.4
18-
1917
# Supported versions of Cassandra
2018
docker.cassandra.3.version=3.11.10
21-
2219
# Docker environment settings
2320
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
2421
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
22+
# Credentials
23+
docker.registry=
24+
docker.credentials=hub.docker.com-springbuildmaster

0 commit comments

Comments
 (0)