Use '--registry-mirror' with CI Docker

spring-projects · Nov 19, 2021 · 1ca278f · 1ca278f
1 parent 5b11628
commit 1ca278f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/ci/images/docker-lib.sh b/ci/images/docker-lib.sh
@@ -68,12 +68,8 @@ start_docker() {
 
   server_args="${server_args}"
 
-  for registry in $3; do
-    server_args="${server_args} --insecure-registry ${registry}"
-  done
-
-  if [ -n "$4" ]; then
-    server_args="${server_args} --registry-mirror $4"
+  if [ -n "$1" ]; then
+    server_args="${server_args} --registry-mirror https://$1"
   fi
 
   try_start() {

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -39,6 +39,7 @@ anchors:
     file: git-repo/ci/tasks/build-project.yml
     params:
       BRANCH: ((branch))
+      DOCKER_HUB_MIRROR: ((docker-hub-mirror))
       <<: *gradle-enterprise-task-params
       <<: *docker-hub-task-params
   run-system-tests-task-params: &run-system-tests-task-params

diff --git a/ci/tasks/build-project.yml b/ci/tasks/build-project.yml
@@ -15,11 +15,12 @@ params:
   GRADLE_ENTERPRISE_CACHE_USERNAME:
   GRADLE_ENTERPRISE_CACHE_PASSWORD:
   GRADLE_ENTERPRISE_URL: https://ge.spring.io
+  DOCKER_HUB_MIRROR:
 run:
   path: bash
   args:
     - -ec
     - |
       source /docker-lib.sh
-      start_docker
+      start_docker $DOCKER_HUB_MIRROR
       ${PWD}/git-repo/ci/scripts/build-project.sh