ci: use chimera:cross image

odrling · Mar 26, 2024 · 6faba3f · 6faba3f
1 parent 3597ffd
commit 6faba3f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/Containerfile b/Containerfile
@@ -1,8 +1,6 @@
-FROM ghcr.io/odrling/chimera:x86_64 AS builder
+FROM ghcr.io/odrling/chimera:cross AS builder
 ARG ARCH
 
-RUN apk upgrade && apk add musl-devel meson clang git lld
-
 COPY . /ffmpegaacsucks
 
 RUN cd /ffmpegaacsucks && ARCH=$ARCH ci/build.sh

diff --git a/ci/build.sh b/ci/build.sh
@@ -2,7 +2,6 @@
 export LDFLAGS="-Wl,-Bsymbolic"
 
 if [ "$ARCH" != x86_64 ]; then
-    apk add "base-cross-$ARCH" "clang-rt-cross-$ARCH" "clang-rt-crt-cross-$ARCH" 
     extra_args="--cross-file ci/$ARCH-chimera-linux-musl.txt"
 fi