File tree Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Original file line number Diff line number Diff 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 ' +
Original file line number Diff line number Diff line change 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
75docker.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
138docker.mongodb.4.4.version =4.4.4
149docker.mongodb.5.0.version =5.0.3
1510
1611# Supported versions of Redis
1712docker.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
2318docker.java.inside.basic =-v $HOME:/tmp/jenkins-home
2419docker.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