Build CI containers for AMD64 and ARM64

inko-lang · Jan 16, 2025 · fc445af · fc445af
1 parent 1f69cbf
commit fc445af
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 34 deletions.
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -7,14 +7,24 @@ on:
         description: 'The name of the image to build'
         required: true
         type: string
+      platform:
+        description: 'The Docker platform to build for'
+        required: false
+        type: string
+        default: linux/amd64
+      runner:
+        description: 'The GitHub runner to use'
+        required: false
+        type: string
+        default: ubuntu-24.04
 
 env:
   REGISTRY: ghcr.io
   NAMESPACE: inko-lang/ci
 
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    runs-on: ${{ inputs.runner }}
     permissions:
       contents: read
       packages: write
@@ -28,5 +38,6 @@ jobs:
       - uses: docker/build-push-action@v5
         with:
           context: ci/docker/${{ inputs.name }}
+          platforms: ${{ inputs.platform }}
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}:${{ inputs.name }}
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -21,16 +21,24 @@ jobs:
   fedora:
     uses: ./.github/workflows/container.yml
     with:
-      name: 'fedora'
-  alpine:
+      name: fedora
+  alpine-amd64:
     uses: ./.github/workflows/container.yml
     with:
-      name: 'alpine'
+      name: alpine
+  alpine-arm64:
+    uses: ./.github/workflows/container.yml
+    with:
+      name: alpine
+      runner: ubuntu-24.04-arm
+      platform: linux/arm64
   debian-amd64:
     uses: ./.github/workflows/container.yml
     with:
-      name: 'debian-amd64'
+      name: debian
   debian-arm64:
     uses: ./.github/workflows/container.yml
     with:
-      name: 'debian-arm64'
+      name: debian
+      runner: ubuntu-24.04-arm
+      platform: linux/arm64
diff --git a/ci/docker/alpine/Dockerfile b/ci/docker/alpine/Dockerfile
@@ -7,7 +7,7 @@ ENV PATH /opt/cargo/bin:$PATH
 ENV RUSTUP_HOME /opt/rustup
 ENV CARGO_HOME /opt/cargo
 
-RUN apk add --update build-base tar git rustup \
+RUN apk add --update build-base tar git rustup rclone \
     llvm$LLVM_VERSION llvm$LLVM_VERSION-dev llvm$LLVM_VERSION-static \
     libstdc++-dev zlib-static zstd-static libxml2-static
 

diff --git a/ci/docker/debian-arm64/Dockerfile b/ci/docker/debian-arm64/Dockerfile
diff --git a/ci/docker/debian-amd64/Dockerfile → ci/docker/debian/Dockerfile b/ci/docker/debian-amd64/Dockerfile → ci/docker/debian/Dockerfile