Skip to content

Commit e588a94

Browse files
author
trayanus1026
committed
Polishing.
Extract docker credentials into properties file. See #2413
1 parent 4800f93 commit e588a94

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
@@ -18,7 +18,7 @@ pipeline {
1818
}
1919

2020
stages {
21-
stage("test: baseline (jdk17)") {
21+
stage("test: baseline (Java 17)") {
2222
when {
2323
beforeAgent(true)
2424
anyOf {
@@ -31,12 +31,12 @@ pipeline {
3131
}
3232
options { timeout(time: 30, unit: 'MINUTES') }
3333
environment {
34-
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
34+
DOCKER_HUB = credentials("${p['docker.credentials']}")
3535
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
3636
}
3737
steps {
3838
script {
39-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
39+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
4040
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
4141
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
4242
sh 'PROFILE=all-dbs ci/test.sh'
@@ -66,7 +66,7 @@ pipeline {
6666

6767
steps {
6868
script {
69-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
69+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7070
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 -s settings.xml -Pci,artifactory ' +
7272
'-Dartifactory.server=https://repo.spring.io ' +

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)