Merge pull request #3823 from lxm/hotfix/mulitarch-build

multi arch build error

.github/workflows/build-multiarch.yaml

@@ -5,7 +5,6 @@ on:
     branches:
       - 'master'
       - 'release*'
-      - '*'
     tags:
       - 'v*'
   pull_request:

hack/docker_build.sh

@@ -40,7 +40,6 @@ if [[ $? != 0 ]]; then
   echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 fi
 
-TAG=$TAG-multiarch
 docker build -f build/ks-apiserver/Dockerfile -t $REPO/ks-apiserver:$TAG .
 docker push $REPO/ks-apiserver:$TAG
 # print the full docker image path for your convience

hack/docker_build_multiarch.sh

@@ -40,12 +40,13 @@ if [[ $? != 0 ]]; then
   echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 fi
 
+TAG=$TAG-multiarch
 docker buildx build --platform=${BUILDPLATFORM} \
                     -f build/Dockerfile \
-                    -t $REPO/ks-apiserver-multiarch:$TAG . \
+                    -t $REPO/ks-apiserver:$TAG . \
                     --target=ks-apiserver --push
 
 docker buildx build --platform=${BUILDPLATFORM} \
                     -f build/Dockerfile \
-                    -t $REPO/ks-controller-manager-multiarch:$TAG . \
+                    -t $REPO/ks-controller-manager:$TAG . \
                     --target=ks-controller-manager --push