From c7018a8b822b6040b423f9b8c58d2ff3dbf27d90 Mon Sep 17 00:00:00 2001 From: sfja Date: Sat, 28 Mar 2026 13:32:51 +0100 Subject: [PATCH] update images --- .github/workflows/verify.yml | 1 - backend/Dockerfile | 9 +++++---- ci-container/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 2410bfe..fbd83c2 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -27,7 +27,6 @@ jobs: container: sfja/h5-mst-ci:latest steps: - uses: actions/checkout@v6 - - run: rustup default stable - name: Check working-directory: ./game run: cargo check diff --git a/backend/Dockerfile b/backend/Dockerfile index 12fd857..04b15bd 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,13 +1,14 @@ -FROM docker.io/alpine:3.23.3 AS builder +FROM alpine:3.23 AS builder WORKDIR /workspace -RUN apk add build-base +RUN apk add build-base mosquitto-dev COPY Makefile . COPY src src COPY tests tests RUN make RELEASE=1 build/backend -FROM docker.io/alpine:3.23.3 AS runner +FROM alpine:3.23 AS runner WORKDIR /workspace -RUN apk add libstdc++ +RUN apk add libstdc++ mosquitto-libs COPY --from=builder /workspace/build/backend /workspace CMD ["/workspace/backend"] + diff --git a/ci-container/Dockerfile b/ci-container/Dockerfile index f1865f4..9f53608 100644 --- a/ci-container/Dockerfile +++ b/ci-container/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:edge -RUN apk add --no-cache curl build-base clang22-extra-tools sdl3-dev mosquitto +RUN apk add --no-cache curl build-base clang22-extra-tools mosquitto-dev sdl3-dev RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ENV PATH="/root/.cargo/bin:${PATH}"