chore: adapt Dockerfile from twilight/http-proxy

Author: z0w13

.github/workflows/docker.yml

@@ -10,42 +10,20 @@ on:
 jobs:
   build-images:
     name: Build Docker Images
-    runs-on: ubuntu-latest
+
     strategy:
       matrix:
         include:
           - tag: amd64
-            arch: amd64
-            rust-target: x86_64-unknown-linux-musl
-            musl-target: x86_64-linux-musl
+            features: ""
+            image: ubuntu-latest
           - tag: armv8
-            arch: armv8
-            rust-target: aarch64-unknown-linux-musl
-            musl-target: aarch64-linux-musl
+            features: ""
+            image: ubuntu-24.04-arm
 
-    steps:
-      # Podman 4.x is necessary here because it supports --platform=$BUILDPLATFORM. Otherwise, podman
-      # would pull the base image for aarch64 when building for aarch64. See https://github.com/containers/buildah/pull/3757
-      # for the implementation. GitHub actions currently still ship Podman 3.x, even though 4.x has been
-      # out for over a year.
-      # The repository used is the same as GitHub actions uses for their source - just that it's the unstable version
-      # rather than the stable one.
-      # TODO: Once podman 4.x is available in actions by default (or in the Ubuntu repositories), remove this.
-      - name: Install podman 4.x
-        run: |
-          sudo mkdir -p /etc/apt/keyrings
-          curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$(lsb_release -rs)/Release.key \
-            | gpg --dearmor \
-            | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
-          echo \
-            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg]\
-              https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$(lsb_release -rs)/ /" \
-            | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
-          sudo apt -qq -y purge buildah podman
-          sudo apt -qq -y autoremove --purge
-          sudo apt update -qq
-          sudo apt -qq -y install podman
+    runs-on: ${{ matrix.image }}
 
+    steps:
       - name: Checkout sources
         uses: actions/checkout@v3
 
@@ -62,13 +40,11 @@ jobs:
         run: |
           podman build \
             --format docker \
-            --arch ${{ matrix.arch }} \
-            --build-arg RUST_TARGET=${{ matrix.rust-target }} \
-            --build-arg MUSL_TARGET=${{ matrix.musl-target }} \
+            --build-arg FEATURES=${{ matrix.features }} \
             -t gateway-queue:${{ matrix.tag }} \
             .
 
-      - name: Push image to ghcr
+      - name: Push image
         if: github.ref == 'refs/heads/trunk' && github.event_name != 'pull_request'
         run: |
           podman tag gateway-queue:${{ matrix.tag }} ghcr.io/${REPO}:${{ matrix.tag }}

Dockerfile

@@ -1,45 +1,13 @@
-# Rust syntax target, either x86_64-unknown-linux-musl, aarch64-unknown-linux-musl, arm-unknown-linux-musleabi etc.
-ARG RUST_TARGET="x86_64-unknown-linux-musl"
-# Musl target, either x86_64-linux-musl, aarch64-linux-musl, arm-linux-musleabi, etc.
-ARG MUSL_TARGET="x86_64-linux-musl"
+# The crate features to build this with
+ARG FEATURES=""
 
-FROM --platform=$BUILDPLATFORM docker.io/alpine:latest as build
-ARG RUST_TARGET
-ARG MUSL_TARGET
+FROM docker.io/library/alpine:latest as build
+ARG FEATURES
 
 RUN apk upgrade && \
     apk add curl gcc musl-dev && \
     curl -sSf https://sh.rustup.rs | sh -s -- --profile minimal --default-toolchain nightly --component rust-src -y
 
-RUN source $HOME/.cargo/env && \
-    mkdir -p /app/.cargo && \
-    if [ "$RUST_TARGET" != $(rustup target list --installed) ]; then \
-        rustup target add $RUST_TARGET && \
-        curl -L "https://musl.cc/$MUSL_TARGET-cross.tgz" -o /toolchain.tgz && \
-        tar xf toolchain.tgz && \
-        ln -s "/$MUSL_TARGET-cross/bin/$MUSL_TARGET-gcc" "/usr/bin/$MUSL_TARGET-gcc" && \
-        ln -s "/$MUSL_TARGET-cross/bin/$MUSL_TARGET-ld" "/usr/bin/$MUSL_TARGET-ld" && \
-        ln -s "/$MUSL_TARGET-cross/bin/$MUSL_TARGET-strip" "/usr/bin/actual-strip" && \
-        GCC_VERSION=$($MUSL_TARGET-gcc --version | grep gcc | awk '{print $3}') && \
-        echo -e "\
-[build]\n\
-rustflags = [\"-L\", \"native=/$MUSL_TARGET-cross/$MUSL_TARGET/lib\", \"-L\", \"native=/$MUSL_TARGET-cross/lib/gcc/$MUSL_TARGET/$GCC_VERSION/\", \"-l\", \"static=gcc\", \"-Clink-self-contained=y\", \"-Clinker-flavor=gcc\"]\n\
-[target.$RUST_TARGET]\n\
-linker = \"$MUSL_TARGET-gcc\"\n\
-[unstable]\n\
-build-std = [\"std\", \"panic_abort\"]\n\
-" > /app/.cargo/config; \
-    else \
-        echo "skipping toolchain as we are native" && \
-        echo -e "\
-[build]\n\
-rustflags = [\"-L\", \"native=/usr/lib\"]\n\
-[unstable]\n\
-build-std = [\"std\", \"panic_abort\"]\n\
-" > /app/.cargo/config && \
-        ln -s /usr/bin/strip /usr/bin/actual-strip; \
-    fi
-
 WORKDIR /app
 
 COPY ./Cargo.lock ./Cargo.lock
@@ -50,8 +18,11 @@ COPY ./Cargo.toml ./Cargo.toml
 RUN mkdir src/
 RUN echo 'fn main() {}' > ./src/main.rs
 RUN source $HOME/.cargo/env && \
-    cargo build --release \
-        --target="$RUST_TARGET"
+    cargo build \
+        --release \
+        -Zbuild-std=std,panic_abort \
+        --target="$(uname -m)-unknown-linux-musl" \
+        --features="$FEATURES"
 
 # Now, delete the fake source and copy in the actual source. This allows us to
 # have a previous compilation step for compiling the dependencies, while being
@@ -63,19 +34,19 @@ RUN source $HOME/.cargo/env && \
 # would have to be re-downloaded and re-compiled.
 #
 # Also, remove the artifacts of building the binaries.
-RUN rm -f target/$RUST_TARGET/release/deps/twilight_gateway_queue*
+RUN rm -f target/$(uname -m)-unknown-linux-musl/release/deps/twilight_gateway_queue*
 COPY ./src ./src
 
 RUN source $HOME/.cargo/env && \
-    cargo build --release \
-        --target="$RUST_TARGET" && \
-    cp target/$RUST_TARGET/release/twilight-gateway-queue /twilight-gateway-queue && \
-    actual-strip /twilight-gateway-queue
+    cargo build \
+        --release \
+        -Zbuild-std=std,panic_abort \
+        --target="$(uname -m)-unknown-linux-musl" --features="$FEATURES" && \
+    cp target/$(uname -m)-unknown-linux-musl/release/twilight-gateway-queue /twilight-gateway-queue && \
+    strip /twilight-gateway-queue
 
 FROM scratch
 
-# And now copy the binary over from the build container. The build container is
-# based on a heavy image.
 COPY --from=build /twilight-gateway-queue /twilight-gateway-queue
 
 CMD ["./twilight-gateway-queue"]