Skip to content

Commit 1c2d078

Browse files
committed
Switch to Broadcom docker proxy.
Closes #217
1 parent fa5358a commit 1c2d078

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

Jenkinsfile

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ pipeline {
3838

3939
steps {
4040
script {
41-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
42-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
43-
"./mvnw -s settings.xml -Pwith-bom-client verify -B -U"
41+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
42+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
43+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
44+
"./mvnw -s settings.xml -Pwith-bom-client verify -B -U"
45+
}
4446
}
4547
}
4648
}
@@ -65,16 +67,18 @@ pipeline {
6567

6668
steps {
6769
script {
68-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
69-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
70-
"./mvnw -s settings.xml -Pci,artifactory " +
71-
"-Dartifactory.server=${p['artifactory.url']} " +
72-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
73-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
74-
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
75-
"-Dartifactory.build-name=spring-data-bom " +
76-
"-Dartifactory.build-number=spring-data-bom-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
77-
"-Dmaven.test.skip=true clean deploy -U -B"
70+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
71+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
72+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
73+
"./mvnw -s settings.xml -Pci,artifactory " +
74+
"-Dartifactory.server=${p['artifactory.url']} " +
75+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
76+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
77+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
78+
"-Dartifactory.build-name=spring-data-bom " +
79+
"-Dartifactory.build-number=spring-data-bom-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
80+
"-Dmaven.test.skip=true clean deploy -U -B"
81+
}
7882
}
7983
}
8084
}

ci/pipeline.properties

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ java.main.tag=17.0.9_9-jdk-focal
33
java.next.tag=20-jdk-jammy
44

55
# Docker container images - standard
6-
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
7-
docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
6+
docker.java.main.image=library/eclipse-temurin:${java.main.tag}
7+
docker.java.next.image=library/eclipse-temurin:${java.next.tag}
88

99
# Supported versions of MongoDB
1010
docker.mongodb.4.4.version=4.4.25
@@ -13,6 +13,7 @@ docker.mongodb.6.0.version=6.0.10
1313

1414
# Supported versions of Redis
1515
docker.redis.6.version=6.2.13
16+
docker.redis.7.version=7.2.4
1617

1718
# Supported versions of Cassandra
1819
docker.cassandra.3.version=3.11.16
@@ -24,6 +25,8 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
2425
# Credentials
2526
docker.registry=
2627
docker.credentials=hub.docker.com-springbuildmaster
28+
docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
29+
docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
2730
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
2831
artifactory.url=https://repo.spring.io
2932
artifactory.repository.snapshot=libs-snapshot-local

0 commit comments

Comments
 (0)