Merge branch 'karmada-io:master' into feature_globalResource

karmada-io · May 12, 2022 · 9f5724c · 9f5724c
2 parents b9449c0 + df6560a
commit 9f5724c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/dockerhub-latest-image.yml b/.github/workflows/dockerhub-latest-image.yml
@@ -45,5 +45,6 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: build and publish images
         env:
+          REGISTRY: karmada
           VERSION: latest
         run: make mp-image-${{ matrix.target }}
diff --git a/.github/workflows/dockerhub-released-image.yml b/.github/workflows/dockerhub-released-image.yml
@@ -40,6 +40,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USER_NAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: build and publish images
-        env: 
+        env:
+          REGISTRY: karmada
           VERSION: ${{ github.ref_name }}
         run: make mp-image-${{ matrix.target }}
diff --git a/hack/docker.sh b/hack/docker.sh
@@ -31,7 +31,7 @@ REGISTRY=${REGISTRY:-"swr.ap-southeast-1.myhuaweicloud.com/karmada"}
 VERSION=${VERSION:="unknown"}
 
 function build_images() {
-  local -ra target=$1
+  local -r target=$1
   local -r output_type=${OUTPUT_TYPE:-docker}
   local platforms="${BUILD_PLATFORMS:-"$(util:host_platform)"}"