From 56bfbfd979219d1212d0a095ed98753f49353ff0 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Thu, 25 Jan 2024 11:36:45 +0100 Subject: [PATCH] feat(docker): Enable multiarch build for amd64 and arm64 Signed-off-by: Helio Chissini de Castro --- .github/actions/ortdocker/action.yml | 5 +++++ .github/workflows/docker-ort.yml | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/.github/actions/ortdocker/action.yml b/.github/actions/ortdocker/action.yml index 9dfff2b04175c..392dd416ceee8 100644 --- a/.github/actions/ortdocker/action.yml +++ b/.github/actions/ortdocker/action.yml @@ -62,6 +62,9 @@ runs: echo $result echo "result=$result" >> $GITHUB_OUTPUT + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker build if: steps.check_image.outputs.result != 'found' uses: docker/setup-buildx-action@v3 @@ -92,6 +95,7 @@ runs: uses: docker/build-push-action@v5 with: context: . + platforms: linux/amd64,linux/arm64 target: ${{ inputs.name }} push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }} load: false @@ -108,6 +112,7 @@ runs: uses: docker/build-push-action@v5 with: context: . + platforms: linux/amd64,linux/arm64 target: ${{ inputs.name }} push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }} load: false diff --git a/.github/workflows/docker-ort.yml b/.github/workflows/docker-ort.yml index 1435e572864a8..e0b83fac2d67d 100644 --- a/.github/workflows/docker-ort.yml +++ b/.github/workflows/docker-ort.yml @@ -305,6 +305,9 @@ jobs: ORT_VERSION=$(./gradlew -q properties --property version | sed -nr "s/version: (.+)/\1/p") echo "ORT_VERSION=${ORT_VERSION}" >> $GITHUB_ENV + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker build uses: docker/setup-buildx-action@v3 @@ -332,6 +335,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . + platforms: linux/amd64,linux/arm64 target: minimal push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }} load: false @@ -371,6 +375,9 @@ jobs: ORT_VERSION=$(./gradlew -q properties --property version | sed -nr "s/version: (.+)/\1/p") echo "ORT_VERSION=${ORT_VERSION}" >> $GITHUB_ENV + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker build uses: docker/setup-buildx-action@v3 @@ -398,6 +405,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . + platforms: linux/amd64,linux/arm64 target: run push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }} load: false