File tree 2 files changed +8
-9
lines changed
2 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ pipeline {
35
35
}
36
36
steps {
37
37
script {
38
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
38
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
39
39
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
40
40
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
41
41
}
@@ -63,7 +63,7 @@ pipeline {
63
63
64
64
steps {
65
65
script {
66
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
66
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
67
67
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
68
68
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
69
69
' -Dartifactory.server=https://repo.spring.io ' +
Original file line number Diff line number Diff line change 1
1
# 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
5
3
6
4
# Docker container images - standard
7
5
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}
10
6
11
7
# Supported versions of MongoDB
12
- docker.mongodb.4.0.version =4.0.23
13
8
docker.mongodb.4.4.version =4.4.4
14
9
docker.mongodb.5.0.version =5.0.3
15
10
16
11
# Supported versions of Redis
17
12
docker.redis.6.version =6.2.4
18
13
19
14
# Supported versions of Cassandra
20
- docker.cassandra.3.version =3.11.10
15
+ docker.cassandra.3.version =3.11.11
21
16
22
17
# Docker environment settings
23
18
docker.java.inside.basic =-v $HOME:/tmp/jenkins-home
24
19
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
You can’t perform that action at this time.
0 commit comments