Merge pull request #1 from theohbrothers/feature/add-multi-arch-images

Feature: Add multi arch images
theohbrothers · Nov 7, 2023 · 78c1653 · 78c1653
2 parents b00adfb + 1c510ac
commit 78c1653
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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; \