diff --git a/Jenkinsfile b/Jenkinsfile index 7c8f935..b9c8a55 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { } steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B' } @@ -63,7 +63,7 @@ pipeline { steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' + '-Dartifactory.server=https://repo.spring.io ' + diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 5d91102..59c2060 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,15 +1,10 @@ # Java versions -java.main.tag=8u312-b07-jdk -java.next.tag=11.0.13_8-jdk -java.lts.tag=17.0.1_12-jdk +java.main.tag=17.0.2_8-jdk # Docker container images - standard docker.java.main.image=eclipse-temurin:${java.main.tag} -docker.java.next.image=eclipse-temurin:${java.next.tag} -docker.java.lts.image=eclipse-temurin:${java.lts.tag} # Supported versions of MongoDB -docker.mongodb.4.0.version=4.0.23 docker.mongodb.4.4.version=4.4.4 docker.mongodb.5.0.version=5.0.3 @@ -17,8 +12,12 @@ docker.mongodb.5.0.version=5.0.3 docker.redis.6.version=6.2.4 # Supported versions of Cassandra -docker.cassandra.3.version=3.11.10 +docker.cassandra.3.version=3.11.11 # Docker environment settings docker.java.inside.basic=-v $HOME:/tmp/jenkins-home 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 + +# Credentials +docker.registry= +docker.credentials=hub.docker.com-springbuildmaster