fix(installer): docker pull with config (tkestack#1591)

eshao731 · Sep 18, 2021 · b288b75 · b288b75
1 parent 563f754
commit b288b75
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
 }