From 581a824683e5cf81364b79bc9d1add0163ea9131 Mon Sep 17 00:00:00 2001 From: Bastian Krol Date: Fri, 2 Feb 2024 10:11:35 +0100 Subject: [PATCH] [dash0] bring back arm64 builds via qemu This effectively reverts aefb61086b180fba9a0d1939e135fc3646af7dbc. Having no arm64 images makes running the demo locally via K8s much harder, because K8s tries to pull the arm64 version of the images and that of course fails when it doesn't exist. --- .github/workflows/build-images.yml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 93f7857758..ad2ef4c520 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -41,21 +41,27 @@ jobs: - file: ./src/adservice/Dockerfile tag_suffix: adservice context: ./ + setup-qemu: true - file: ./src/cartservice/src/Dockerfile tag_suffix: cartservice context: ./ + setup-qemu: false - file: ./src/checkoutservice/Dockerfile tag_suffix: checkoutservice context: ./ + setup-qemu: true - file: ./src/currencyservice/Dockerfile tag_suffix: currencyservice context: ./src/currencyservice + setup-qemu: true - file: ./src/emailservice/Dockerfile tag_suffix: emailservice context: ./src/emailservice + setup-qemu: true - file: ./src/ffspostgres/Dockerfile tag_suffix: ffspostgres context: ./ + setup-qemu: true # NOTE: # https://github.com/open-telemetry/opentelemetry-demo/issues/956 # Until dedicated ARM runners are available for GHA we cannot upgrade @@ -63,45 +69,59 @@ jobs: - file: ./src/featureflagservice/Dockerfile tag_suffix: featureflagservice context: ./ + setup-qemu: true - file: ./src/frontend/Dockerfile tag_suffix: frontend context: ./ + setup-qemu: true - file: ./src/frontendproxy/Dockerfile tag_suffix: frontendproxy context: ./ + setup-qemu: true - file: ./src/loadgenerator/Dockerfile tag_suffix: loadgenerator context: ./ + setup-qemu: true - file: ./src/paymentservice/Dockerfile tag_suffix: paymentservice context: ./ + setup-qemu: true - file: ./src/productcatalogservice/Dockerfile tag_suffix: productcatalogservice context: ./ + setup-qemu: true - file: ./src/quoteservice/Dockerfile tag_suffix: quoteservice context: ./ + setup-qemu: true - file: ./src/shippingservice/Dockerfile tag_suffix: shippingservice context: ./ + setup-qemu: true - file: ./src/recommendationservice/Dockerfile tag_suffix: recommendationservice context: ./ + setup-qemu: true - file: ./src/kafka/Dockerfile tag_suffix: kafka context: ./ + setup-qemu: true - file: ./src/accountingservice/Dockerfile tag_suffix: accountingservice context: ./ + setup-qemu: true - file: ./src/frauddetectionservice/Dockerfile tag_suffix: frauddetectionservice context: ./ + setup-qemu: true - file: ./src/frontend/Dockerfile.cypress tag_suffix: frontend-tests context: ./ + setup-qemu: true - file: ./test/Dockerfile tag_suffix: integrationTests context: ./ + setup-qemu: true steps: - uses: actions/checkout@v4 @@ -138,6 +158,12 @@ jobs: with: mask-password: true + - name: Set up QEMU + if: ${{ matrix.file_tag.setup-qemu }} + uses: docker/setup-qemu-action@v3 + with: + image: tonistiigi/binfmt:master + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: @@ -151,7 +177,7 @@ jobs: with: context: ${{ matrix.file_tag.context }} file: ${{ matrix.file_tag.file }} - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 push: ${{ inputs.push }} tags: | ${{ env.AWS_ECR_REPO }}:${{ inputs.version }}-${{ matrix.file_tag.tag_suffix }}