From 4a472b952dc25a8ae728fe17c384bdf6d942500b Mon Sep 17 00:00:00 2001 From: ouyangkang Date: Mon, 11 Mar 2024 18:33:18 +0800 Subject: [PATCH] modify dockerfile 3 --- Dockerfile | 27 ++++----------------------- Dockerfile.gitlab | 2 +- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 201a765..32bb06f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,26 +1,7 @@ -# FROM ghcr.io/bmrlab/muse-credits:v1.1 as github-credits +FROM ghcr.io/bmrlab/muse-credits:v1.1 as github-credits -# ENV start_params=" " +ENV start_params=" " -# EXPOSE 8080 -# CMD ["sh", "-c", "/usr/app/credits-cli task ${task_params} && /usr/app/credits-cli start"] +EXPOSE 8080 +CMD ["sh", "-c", "/usr/app/credits-cli task ${task_params} && /usr/app/credits-cli start"] - -FROM rust:1.74-slim as builder - -WORKDIR /usr/src/ - -COPY . . - -RUN apt-get install -y libssl-dev && apt-get -y install pkg-config - -RUN cargo build --release - -FROM debian:bookworm-slim - -RUN apt-get update && apt-get install -y libc6 - -WORKDIR /usr/app - -COPY --from=builder /usr/src/config /usr/app/config -COPY --from=builder /usr/src/target/release/credits-cli /usr/app/credits-cli \ No newline at end of file diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab index a0a835a..b78982a 100644 --- a/Dockerfile.gitlab +++ b/Dockerfile.gitlab @@ -4,7 +4,7 @@ WORKDIR /usr/src/ COPY . . -RUN apt-get install -y libssl-dev && apt-get -y install pkg-config +RUN apt-get update && apt-get install -y libssl-dev pkg-config RUN cargo build --release