From b288b75dbab59410c49c385b03f4338d15c2bb28 Mon Sep 17 00:00:00 2001
From: Leo Ryu <leo-ryu@outlook.com>
Date: Sat, 18 Sep 2021 15:18:30 +0800
Subject: [PATCH] fix(installer): docker pull with config (#1591)

---
 .github/workflows/e2e.yml                   | 2 +-
 .github/workflows/release.yml               | 1 +
 build/docker/tools/provider-res/download.sh | 2 +-
 build/docker/tools/tke-installer/release.sh | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 18044be20..6c043e3b8 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -22,7 +22,7 @@ env:
   NEED_DELETE: ${{ secrets.NEED_DELETE }}
   DOCKER_HUB_ACTION_AUTH: ${{ secrets.DOCKER_HUB_ACTION_AUTH }}
   INSTANCE_TYPES: ${{ secrets.INSTANCE_TYPES }}
-  TEST1: ${{ secrets.TEST.TEST1 }}
+  DOCKER_PULL_CONFIG: ${{ secrets.DOCKER_PULL_CONFIG }}
 jobs:
   image:
     name: build tke image
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3b9d45070..da83d64da 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,6 +29,7 @@ env:
   NEED_DELETE: ${{ secrets.NEED_DELETE }}
   DOCKER_HUB_ACTION_AUTH: ${{ secrets.DOCKER_HUB_ACTION_AUTH }}
   INSTANCE_TYPES: ${{ secrets.INSTANCE_TYPES }}
+  DOCKER_PULL_CONFIG: ${{ secrets.DOCKER_PULL_CONFIG }}
 
 jobs:
   image:
diff --git a/build/docker/tools/provider-res/download.sh b/build/docker/tools/provider-res/download.sh
index cec33ca76..3d060a672 100755
--- a/build/docker/tools/provider-res/download.sh
+++ b/build/docker/tools/provider-res/download.sh
@@ -134,7 +134,7 @@ function download::pkgs() {
     exit 1
   fi
   docker_arch=${archMap[${arch}]}
-  docker pull --platform=${docker_arch} centos:7
+  docker pull --config=${DOCKER_PULL_CONFIG} --platform=${docker_arch} centos:7
   for pkg in ${PKGS}; do
     docker run --platform="${docker_arch}" -e OS="${os}" -e ARCH="${arch}" -e PKG="${pkg}" --rm -v"${SCRIPT_DIR}":/tmp/bin -v$(realpath $(pwd)):/output centos:7 /tmp/bin/run.sh
   done
diff --git a/build/docker/tools/tke-installer/release.sh b/build/docker/tools/tke-installer/release.sh
index b48e4f4f1..790679d6b 100755
--- a/build/docker/tools/tke-installer/release.sh
+++ b/build/docker/tools/tke-installer/release.sh
@@ -111,7 +111,7 @@ function build::installer() {
     cp -v "${DST_DIR}/provider/baremetal/res/${target_platform}/nerdctl-${target_platform}-${NERDCTL_VERSION}.tar.gz" "${INSTALLER_DIR}/res/nerdctl.tar.gz"
 
     docker save "${REGISTRY_PREFIX}/tke-installer-${arch}:$VERSION" -o "${INSTALLER_DIR}/res/tke-installer.tar"
-    docker pull "${REGISTRY_PREFIX}/registry-${arch}:$REGISTRY_VERSION"
+    docker --config=${DOCKER_PULL_CONFIG} pull "${REGISTRY_PREFIX}/registry-${arch}:$REGISTRY_VERSION"
     docker save "${REGISTRY_PREFIX}/registry-${arch}:$REGISTRY_VERSION" -o "${INSTALLER_DIR}/res/registry.tar"
 
     sed -i "s;VERSION=.*;VERSION=$VERSION;g" "${INSTALLER_DIR}/install.sh"
@@ -136,7 +136,7 @@ function prepare::images() {
   make build BINS=generate-images VERSION="$VERSION"
 
   $GENERATE_IMAGES_BIN
-  $GENERATE_IMAGES_BIN | sed "s;^;${REGISTRY_PREFIX}/;" | xargs -n1 -I{} sh -c "docker pull {} || exit 255"
+  $GENERATE_IMAGES_BIN | sed "s;^;${REGISTRY_PREFIX}/;" | xargs -n1 -I{} sh -c "docker --config=${DOCKER_PULL_CONFIG} pull {} || exit 255"
   $GENERATE_IMAGES_BIN | sed "s;^;${REGISTRY_PREFIX}/;" | xargs docker save | gzip -c >"${DST_DIR}"/images.tar.gz
 }