diff --git a/.github/workflows/build-image-and-push.yaml b/.github/workflows/build-image-and-push.yaml index c45f36ecd..81d922e95 100644 --- a/.github/workflows/build-image-and-push.yaml +++ b/.github/workflows/build-image-and-push.yaml @@ -40,7 +40,6 @@ jobs: path: |- envoy istio - external .git/modules key: ${{ runner.os }}-submodules-${{ github.run_id }} restore-keys: ${{ runner.os }}-submodules @@ -111,7 +110,6 @@ jobs: path: |- envoy istio - external .git/modules key: ${{ runner.os }}-submodules-${{ github.run_id }} restore-keys: ${{ runner.os }}-submodules @@ -137,8 +135,8 @@ jobs: - name: Build Pilot-Discovery Image and Push run: | - 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' + GOPROXY="https://proxy.golang.org,direct" TARGET_ARCH=amd64 make build-istio + 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 @@ -183,7 +181,6 @@ jobs: path: |- envoy istio - external .git/modules key: ${{ runner.os }}-submodules-${{ github.run_id }} restore-keys: ${{ runner.os }}-submodules @@ -202,15 +199,14 @@ jobs: - name: Build Gateway Image and Push run: | - 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' + GOPROXY="https://proxy.golang.org,direct" TARGET_ARCH=amd64 make build-gateway + 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 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