Skip to content

Commit d6d8461

Browse files
committed
Polishing.
Extract docker credentials into properties file. See #73
1 parent cefae6c commit d6d8461

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
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

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
# Java versions
2-
java.main.tag=8u312-b07-jdk
3-
java.next.tag=11.0.13_8-jdk
4-
java.lts.tag=17.0.1_12-jdk
2+
java.main.tag=17.0.2_8-jdk
53

64
# Docker container images - standard
75
docker.java.main.image=eclipse-temurin:${java.main.tag}
8-
docker.java.next.image=eclipse-temurin:${java.next.tag}
9-
docker.java.lts.image=eclipse-temurin:${java.lts.tag}
106

117
# Supported versions of MongoDB
12-
docker.mongodb.4.0.version=4.0.23
138
docker.mongodb.4.4.version=4.4.4
149
docker.mongodb.5.0.version=5.0.3
1510

1611
# Supported versions of Redis
1712
docker.redis.6.version=6.2.4
1813

1914
# Supported versions of Cassandra
20-
docker.cassandra.3.version=3.11.10
15+
docker.cassandra.3.version=3.11.11
2116

2217
# Docker environment settings
2318
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
2419
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
20+
21+
# Credentials
22+
docker.registry=
23+
docker.credentials=hub.docker.com-springbuildmaster

0 commit comments

Comments
 (0)