From 1c510ace248e9b40d63e5bd977231ff2d5df8471 Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Fri, 3 Nov 2023 20:52:59 +0000 Subject: [PATCH] Feature: Add multi arch images --- .github/workflows/ci-master-pr.yml | 6 +++--- generate/definitions/VARIANTS.ps1 | 3 +-- variants/1.0.3/Dockerfile | 8 ++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml index 15550fb..020a305 100644 --- a/.github/workflows/ci-master-pr.yml +++ b/.github/workflows/ci-master-pr.yml @@ -108,7 +108,7 @@ jobs: uses: docker/build-push-action@v3 with: context: variants/1.0.3 - platforms: linux/amd64 + platforms: linux/386,linux/amd64,linux/arm64 push: false tags: | ${{ github.repository }}:${{ steps.prep-1-0-3.outputs.REF_VARIANT }} @@ -122,7 +122,7 @@ jobs: uses: docker/build-push-action@v3 with: context: variants/1.0.3 - platforms: linux/amd64 + platforms: linux/386,linux/amd64,linux/arm64 push: true tags: | ${{ github.repository }}:${{ steps.prep-1-0-3.outputs.REF_VARIANT }} @@ -135,7 +135,7 @@ jobs: uses: docker/build-push-action@v3 with: context: variants/1.0.3 - platforms: linux/amd64 + platforms: linux/386,linux/amd64,linux/arm64 push: true tags: | ${{ github.repository }}:${{ steps.prep-1-0-3.outputs.VARIANT }} diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1 index dda8cd8..96f3a37 100644 --- a/generate/definitions/VARIANTS.ps1 +++ b/generate/definitions/VARIANTS.ps1 @@ -19,8 +19,7 @@ $VARIANTS = @( # Metadata object _metadata = @{ package_version = $variant['package_version'] - platforms = 'linux/amd64' - # platforms = 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x' + platforms = 'linux/386,linux/amd64,linux/arm64' components = $subVariant['components'] job_group_key = $variant['package_version'] } diff --git a/variants/1.0.3/Dockerfile b/variants/1.0.3/Dockerfile index a2d5079..0406140 100644 --- a/variants/1.0.3/Dockerfile +++ b/variants/1.0.3/Dockerfile @@ -3,10 +3,18 @@ FROM alpine:3.17 RUN set -eux; \ PAGEFIND_EXTENDED_VERSION=v1.0.3; \ case "$( uname -m )" in \ + 'x86') \ + URL="https://github.com/CloudCannon/pagefind/releases/download/v1.0.3/pagefind_extended-v1.0.3-x86_64-unknown-linux-musl.tar.gz"; \ + SHA256=aec60f1db9fd693986b2c3d6253f98e6710e5046a371fc1c7e3ecc5fc982a95d; \ + ;; \ 'x86_64') \ URL="https://github.com/CloudCannon/pagefind/releases/download/v1.0.3/pagefind_extended-v1.0.3-x86_64-unknown-linux-musl.tar.gz"; \ SHA256=aec60f1db9fd693986b2c3d6253f98e6710e5046a371fc1c7e3ecc5fc982a95d; \ ;; \ + 'aarch64') \ + URL="https://github.com/CloudCannon/pagefind/releases/download/v1.0.3/pagefind_extended-v1.0.3-aarch64-unknown-linux-musl.tar.gz"; \ + SHA256=575885fb7086a31b9322b7bba0b0baf57bb2586b1fcc7661a88a73ffe17c8134; \ + ;; \ *) \ echo "Architecture not supported"; \ exit 1; \