Make sane dockerfile

Author: randomairborne

.github/workflows/build.yml

@@ -19,15 +19,17 @@ jobs:
 
   build:
     needs: [check]
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.platform.gha-image }}
     strategy:
       fail-fast: false
       matrix:
         platform:
           - docker: linux/amd64
-            llvm: x86_64
+            gha-image: ubuntu-24.04
+            slug: x86_64
           - docker: linux/arm64
-            llvm: aarch64
+            gha-image: ubuntu-24.04-arm
+            slug: aarch64
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -48,8 +50,6 @@ jobs:
         with:
           context: .
           platforms: ${{ matrix.platform.docker }}
-          build-args: |
-            LLVMTARGETARCH=${{ matrix.platform.llvm }}
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
@@ -61,7 +61,7 @@ jobs:
       - name: Upload digest
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.platform.llvm }}
+          name: digests-${{ matrix.platform.slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1

Dockerfile

@@ -1,17 +1,14 @@
-ARG LLVMTARGETARCH
-FROM --platform=${BUILDPLATFORM} ghcr.io/randomairborne/cross-cargo:${LLVMTARGETARCH} AS builder
-ARG LLVMTARGETARCH
+FROM rust:alpine AS builder
 
 WORKDIR /build
 
 COPY . .
 
-RUN cargo build --release --target ${LLVMTARGETARCH}-unknown-linux-musl
+RUN cargo build --release
 
 FROM scratch
-ARG LLVMTARGETARCH
 
-COPY --from=builder /build/target/${LLVMTARGETARCH}-unknown-linux-musl/release/giveip /usr/bin/giveip
+COPY --from=builder /build/target/release/giveip /usr/bin/giveip
 EXPOSE 8080
 
 ENTRYPOINT ["/usr/bin/giveip"]