just docker again

Author: randomairborne

.github/workflows/build.yml

@@ -108,77 +108,4 @@ jobs:
           - 8080:8080
     needs: [merge-docker]
     steps:
-      - run: curl --fail http://localhost:8080/
-
-  build-debs:
-    needs: [check]
-    runs-on: ${{ matrix.platform.gha-image }}
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - slug: amd64
-            gha-image: ubuntu-24.04
-          - slug: arm64
-            gha-image: ubuntu-24.04-arm
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-
-      - name: Install cargo
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Install apt dependencies
-        run: sudo apt-get install jq dpkg-dev
-
-      - name: Prepare cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          key: ${{ matrix.platform.slug }}
-
-      - name: Build binary
-        run: cargo b --release
-
-      - name: Generate deb templates
-        run: ci/debpkg.sh ${{ matrix.platform.slug }}
-
-      - name: Package debfiles
-        run: dpkg --build target/deb/*
-
-      - name: Upload debfile
-        uses: actions/upload-artifact@v4
-        with:
-          name: deb-${{ matrix.platform.slug }}
-          path: target/deb/*.deb
-
-  publish-debs:
-    needs: [build-debs]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-
-      - name: Install apt dependencies
-        run: sudo apt-get install dpkg-dev gpg
-
-      - name: Install s3 CLI
-        run: sudo snap install aws-cli --classic
-
-      - name: Download debfiles
-        uses: actions/download-artifact@v4
-        with:
-          pattern: deb-*
-          merge-multiple: true
-
-      - name: Import private keys
-        run: echo "${{ secrets.GPG_PRIVATE_KEY }}" | gpg --import
-
-      - name: Sign and prepare apt repo
-        run: ./ci/signify.sh *.deb
-
-      - name: Publish
-        run: aws s3 sync apt-repo/mcping/ s3://apt-repos/mcping/
-        env:
-          AWS_ENDPOINT_URL: https://${{ secrets.S3_ACCOUNT_ID }}.r2.cloudflarestorage.com/
-          AWS_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_KEY }}
+      - run: curl --fail http://localhost:8080/

Dockerfile

@@ -1,28 +1,29 @@
-FROM rust:alpine AS server-builder
-
-RUN apk add musl-dev
-
-WORKDIR /build
-
-COPY . .
-
-RUN cargo build --release
-
 FROM ghcr.io/randomairborne/asset-squisher:latest AS client-builder
 
 COPY /assets/ /uncompressed-assets/
 
 RUN asset-squisher /uncompressed-assets/ /assets/
 
-FROM scratch
+FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
+WORKDIR /app
 
-WORKDIR /
+FROM chef AS planner
+COPY . .
+RUN cargo chef prepare --recipe-path recipe.json
+
+FROM chef AS builder
+COPY --from=planner /app/recipe.json recipe.json
+RUN cargo chef cook --release --recipe-path recipe.json
+COPY . .
+RUN cargo build --release
+
+FROM debian:bookworm-slim AS runtime
+WORKDIR /app
 
-COPY --from=server-builder /build/target/release/mcping /usr/bin/mcping
-COPY --from=server-builder /build/target/release/mcping-healthcheck /usr/bin/mcping-healthcheck
+COPY --from=builder /app/target/release/mcping /usr/local/bin
+COPY --from=server-builder /app/target/release/mcping-healthcheck /usr/local/bin/mcping-healthcheck
 COPY --from=client-builder /assets/ /var/www/mcping/
 
 ENV ASSET_DIR="/var/www/mcping/"
-
 HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD ["/usr/bin/mcping-healthcheck", "http://127.0.0.1:8080"]
-ENTRYPOINT ["/usr/bin/mcping"]
+ENTRYPOINT ["/usr/local/bin/mcping"]