From 5a63563982543648a3840fb6f841538a3dffd1cd Mon Sep 17 00:00:00 2001 From: Moritz Ruth Date: Sun, 2 Mar 2025 13:40:16 +0100 Subject: [PATCH] Revert container image changes as they did not fix the DNS issue --- Containerfile | 6 +++--- rust-toolchain.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Containerfile b/Containerfile index e7c3b28..787b29c 100644 --- a/Containerfile +++ b/Containerfile @@ -1,16 +1,16 @@ -FROM docker.io/rustlang/rust:nightly AS app-builder +FROM docker.io/rustlang/rust:nightly-alpine AS app-builder WORKDIR /app COPY . /app +RUN apk add musl-dev RUN CADDY_PATH=/caddy cargo build --release FROM docker.io/caddy:builder-alpine AS caddy-builder RUN xcaddy build -FROM gcr.io/distroless/cc-debian12:latest +FROM gcr.io/distroless/static-debian12 COPY --from=app-builder /app/target/release/sscdc / COPY --from=caddy-builder /usr/bin/caddy /caddy VOLUME "/config.toml" -VOLUME "/sites" CMD ["./sscdc"] \ No newline at end of file diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b223014..108eb52 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] channel = "nightly" -targets = ["x86_64-unknown-linux-gnu"] \ No newline at end of file +targets = ["x86_64-unknown-linux-musl"] \ No newline at end of file