feat: Optimize Docker build for cross-platform compilation and caching

Author: code-inflation

.github/workflows/CI.yml

@@ -36,10 +36,23 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx cache
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64,linux/arm64
           push: false
           tags: |
             cybuerg/cfspeedtest:${{ github.sha }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+      - name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.github/workflows/release.yaml

@@ -52,6 +52,13 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx cache
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
       - name: Log in to DockerHub
         uses: docker/login-action@v3
         with:
@@ -65,3 +72,9 @@ jobs:
           tags: |
             cybuerg/cfspeedtest:${{ github.ref_name }}
             cybuerg/cfspeedtest:latest
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+      - name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

Dockerfile

@@ -1,12 +1,46 @@
-FROM rust:slim-bullseye as builder
+FROM --platform=$BUILDPLATFORM rust:slim-bullseye as builder
+
+# Install cross-compilation tools if needed
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] && [ "$BUILDPLATFORM" = "linux/amd64" ]; then \
+    dpkg --add-architecture arm64 && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+    gcc-aarch64-linux-gnu libc6-dev-arm64-cross && \
+    rustup target add aarch64-unknown-linux-gnu && \
+    rm -rf /var/lib/apt/lists/*; \
+    fi
+
+# Set the correct target
+ARG RUST_TARGET="x86_64-unknown-linux-gnu"
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
+    echo "RUST_TARGET=aarch64-unknown-linux-gnu"; \
+    export RUST_TARGET="aarch64-unknown-linux-gnu"; \
+    fi
+
+# Create a new empty project for caching dependencies
 WORKDIR /usr/src/cfspeedtest
 COPY Cargo.toml Cargo.lock ./
+RUN mkdir -p src && \
+    echo "fn main() {}" > src/main.rs && \
+    echo "pub fn dummy() {}" > src/lib.rs && \
+    cargo fetch
+
+# Build the actual application
 COPY src ./src
-RUN cargo install --path .
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
+    RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc" \
+    cargo build --release --target aarch64-unknown-linux-gnu && \
+    cp target/aarch64-unknown-linux-gnu/release/cfspeedtest /usr/local/bin/; \
+    else \
+    cargo build --release && \
+    cp target/release/cfspeedtest /usr/local/bin/; \
+    fi
 
-FROM debian:bullseye-slim
+FROM --platform=$TARGETPLATFORM debian:bullseye-slim
 RUN apt-get update && apt-get install -y --no-install-recommends tini && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /usr/local/cargo/bin/cfspeedtest /usr/local/bin/cfspeedtest
+COPY --from=builder /usr/local/bin/cfspeedtest /usr/local/bin/cfspeedtest
 
 # tini will be PID 1 and handle signal forwarding and process reaping
 ENTRYPOINT ["/usr/bin/tini", "--", "cfspeedtest"]