Skip to content

Commit 902dd0b

Browse files
committed
Use local docker mirror for test containers
See gh-24343
1 parent 1026936 commit 902dd0b

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

ci/images/docker-lib.sh

+2-6
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,8 @@ start_docker() {
6868

6969
server_args="${server_args}"
7070

71-
for registry in $3; do
72-
server_args="${server_args} --insecure-registry ${registry}"
73-
done
74-
75-
if [ -n "$4" ]; then
76-
server_args="${server_args} --registry-mirror $4"
71+
if [ -n "$1" ]; then
72+
server_args="${server_args} --registry-mirror https://$1"
7773
fi
7874

7975
try_start() {

ci/pipeline.yml

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ anchors:
3939
file: git-repo/ci/tasks/build-project.yml
4040
params:
4141
BRANCH: ((branch))
42+
DOCKER_HUB_MIRROR: ((docker-hub-mirror))
4243
<<: *gradle-enterprise-task-params
4344
<<: *docker-hub-task-params
4445
run-system-tests-task-params: &run-system-tests-task-params

ci/tasks/build-project.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ params:
1515
GRADLE_ENTERPRISE_CACHE_USERNAME:
1616
GRADLE_ENTERPRISE_CACHE_PASSWORD:
1717
GRADLE_ENTERPRISE_URL: https://ge.spring.io
18+
DOCKER_HUB_MIRROR:
1819
run:
1920
path: bash
2021
args:
2122
- -ec
2223
- |
2324
source /docker-lib.sh
24-
start_docker
25+
start_docker $DOCKER_HUB_MIRROR
2526
${PWD}/git-repo/ci/scripts/build-project.sh

0 commit comments

Comments
 (0)