fix: fix docker image build (#47) (#48)

Author: sassman

.dockerignore

@@ -1,3 +1 @@
-*
-!src
-!Cargo.*
+target/

.github/workflows/build.yml

@@ -74,6 +74,25 @@ jobs:
         run: cargo deny check advisories bans sources
         continue-on-error: true
 
+  build-docker:
+    name: build docker image
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          context: .
+          push: false
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
   publish-dry-run:
     name: publish dry run
     needs: tests

.github/workflows/publish-to-dockerhub.yml

@@ -29,9 +29,16 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAME }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and push Docker image
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64,linux/arm64
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/publish-to-ghcr.yml

@@ -34,9 +34,16 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and push Docker image
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64,linux/arm64
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}

Dockerfile

@@ -1,7 +1,13 @@
-FROM ekidd/rust-musl-builder:latest as builder
+FROM rust:alpine3.21 as builder
 
-ADD --chown=rust:rust . ./
-RUN cargo build --release
+WORKDIR /app
+
+COPY . ./
+RUN apk update && \
+    apk add musl-dev jq && \
+    cargo build --release --message-format=json > build.json
+# copy binary to a new location
+RUN jq -r '.executable | select(. != null)' build.json | xargs -I '{}' cp '{}' /app
 
 # final image
 FROM alpine:latest
@@ -10,8 +16,8 @@ LABEL name="ssd-benchmark"
 LABEL org.opencontainers.image.source="https://github.com/sassman/ssd-benchmark-rs"
 LABEL repository="https://github.com/sassman/ssd-benchmark-rs"
 LABEL homepage="https://github.com/sassman/ssd-benchmark-rs"
-LABEL maintainer="Sven Assmann"
+LABEL maintainer="Sven Kanoldt <sven@d34dl0ck.me>"
 
-COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/ssd-benchmark \
-                    /usr/local/bin/
-CMD /usr/local/bin/ssd-benchmark
+COPY --from=builder /app/ssd-benchmark \
+    /usr/local/bin/
+CMD /usr/local/bin/ssd-benchmark