From ba75261bafeb61a621f6c7425514fba009a8e0b1 Mon Sep 17 00:00:00 2001 From: redbinder0526 Date: Sat, 8 Aug 2026 20:28:00 +0200 Subject: [PATCH] remove musl and fix ci bug --- Dockerfile | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 16df9c1..4a89f3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,13 @@ # syntax=docker/dockerfile:1 -FROM rust:alpine AS chef -RUN apk add --no-cache openssl-dev musl-dev openssl-libs-static lld git g++ make cmake +FROM rust:1.80-slim-bookworm AS chef +RUN apt-get update && apt-get install -y --no-install-recommends \ + pkg-config \ + libssl-dev \ + git \ + g++ \ + make \ + cmake \ + && rm -rf /var/lib/apt/lists/* RUN cargo install cargo-chef WORKDIR /app @@ -12,28 +19,27 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef AS builder COPY --from=planner /app/recipe.json recipe.json -ENV OPENSSL_LIB_DIR=/usr/lib -ENV OPENSSL_INCLUDE_DIR=/usr/include/openssl -ENV OPENSSL_STATIC=1 - RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/app/target \ - cargo chef cook --release --recipe-path recipe.json --target x86_64-unknown-linux-musl + cargo chef cook --release --recipe-path recipe.json COPY . . RUN git submodule update --init RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/app/target \ - cargo build --release --target x86_64-unknown-linux-musl && \ - mkdir -p /app/dist + cargo build --release && \ + mkdir -p /app/dist && \ + cp /app/target/release/spacebot /app/dist/ -COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/spacebot /app/dist/ - -FROM alpine:latest AS final +FROM debian:bookworm-slim AS final WORKDIR /app -RUN apk add --no-cache python3 libstdc++ +RUN apt-get update && apt-get install -y --no-install-recommends \ + python3 \ + libssl3 \ + ca-certificates \ + && rm -rf /var/lib/apt/lists/* COPY --from=builder /app/dist/spacebot ./spacebot ENTRYPOINT ["./spacebot"] \ No newline at end of file