ci: fix cross compilation

base image has to be set in the job so it doesn't try to pull host arch
odrling · Jul 22, 2024 · d469b61 · d469b61
1 parent 5727b79
commit d469b61
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,7 +60,9 @@ jobs:
           image: ${{ env.IMAGE_NAME }}
           tags: ${{ github.sha }}-${{ matrix.config.arch }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: ARCH=${{ matrix.config.arch }}
+          build-args: |
+            ARCH=${{ matrix.config.arch }}
+            BUILDER_IMAGE=ghcr.io/odrling/chimera:cross-x86_64
           containerfiles: Containerfile
 
       - name: Push image

diff --git a/Containerfile b/Containerfile
@@ -1,4 +1,5 @@
-FROM ghcr.io/odrling/chimera:cross AS builder
+ARG BUILDER_IMAGE=ghcr.io/odrling/chimera:cross
+FROM ${BUILDER_IMAGE} AS builder
 ARG ARCH
 
 COPY . /ffmpegaacsucks