From 1913508f5e52c19ab688100ce6f5d8b7191de803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=84=E6=BD=AD?= Date: Tue, 15 Aug 2023 14:43:19 +0800 Subject: [PATCH] Update build-image-and-push.yaml --- .github/workflows/build-image-and-push.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-image-and-push.yaml b/.github/workflows/build-image-and-push.yaml index 94cff5fd5..c45f36ecd 100644 --- a/.github/workflows/build-image-and-push.yaml +++ b/.github/workflows/build-image-and-push.yaml @@ -74,7 +74,6 @@ jobs: readarray -t IMAGES <<< "${{ steps.docker-meta.outputs.tags }}" for image in ${IMAGES[@]}; do echo "Image: $image" - docker manifest rm $image docker manifest create $image $BUILT_IMAGE:$GITHUB_SHA-amd64 $BUILT_IMAGE:$GITHUB_SHA-arm64 docker manifest push $image done @@ -138,15 +137,14 @@ jobs: - name: Build Pilot-Discovery Image and Push run: | - sudo GOPROXY="https://proxy.golang.org,direct" TARGET_ARCH=amd64 make build-istio - sudo GOPROXY="https://proxy.golang.org,direct" TARGET_ARCH=arm64 make build-istio + sudo sh -c 'GOPROXY="https://proxy.golang.org,direct" TARGET_ARCH=amd64 make build-istio' + sudo sh -c 'GOPROXY="https://proxy.golang.org,direct" TARGET_ARCH=arm64 make build-istio' BUILT_IMAGE="higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/pilot" docker push $BUILT_IMAGE:$GITHUB_SHA-amd64 docker push $BUILT_IMAGE:$GITHUB_SHA-arm64 readarray -t IMAGES <<< "${{ steps.docker-meta.outputs.tags }}" for image in ${IMAGES[@]}; do echo "Image: $image" - docker manifest rm $image docker manifest create $image $BUILT_IMAGE:$GITHUB_SHA-amd64 $BUILT_IMAGE:$GITHUB_SHA-arm64 docker manifest push $image done @@ -204,8 +202,8 @@ jobs: - name: Build Gateway Image and Push run: | - sudo GOPROXY="https://proxy.golang.org,direct" TARGET_ARCH=amd64 make build-gateway - sudo GOPROXY="https://proxy.golang.org,direct" TARGET_ARCH=arm64 make build-gateway + sudo sh -c 'GOPROXY="https://proxy.golang.org,direct" TARGET_ARCH=amd64 make build-gateway' + sudo sh -c 'GOPROXY="https://proxy.golang.org,direct" TARGET_ARCH=arm64 make build-gateway' BUILT_IMAGE="higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/proxyv2" docker push $BUILT_IMAGE:$GITHUB_SHA-amd64 docker push $BUILT_IMAGE:$GITHUB_SHA-arm64