diff --git a/Containerfile b/Containerfile index e4d9749..30b5850 100644 --- a/Containerfile +++ b/Containerfile @@ -2,20 +2,20 @@ FROM lukemathwalker/cargo-chef:latest-rust-slim as chef WORKDIR /app FROM chef AS planner -COPY ./Cargo.toml ./Cargo.lock ./ -COPY ./src ./src -RUN cargo chef prepare +COPY . . +RUN cargo chef prepare --recipe-path recipe.json FROM chef AS builder -COPY --from=planner /app/recipe.json . -RUN cargo chef cook --release +COPY --from=planner /app/recipe.json recipe.json +RUN cargo chef cook --release --recipe-path recipe.json COPY . . RUN cargo build --release -RUN mv ./target/release/metasearch2 ./app -FROM scratch AS runtime +FROM debian:bookworm-slim AS runtime WORKDIR /app -COPY --from=builder /app/app /usr/local/bin/ -COPY ./config.toml /usr/local/bin/ +COPY --from=builder /app/config.toml /usr/local/bin/config.toml +COPY --from=builder /app/target/release/metasearch2 /usr/local/bin/metasearch2 +ARG CONFIG +ENV CONFIG=${CONFIG} EXPOSE 28019 -ENTRYPOINT ["/usr/local/bin/app"] +ENTRYPOINT /usr/local/bin/metasearch2 $CONFIG \ No newline at end of file diff --git a/compose.yml b/compose.yml index 5832886..c7390e2 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,9 @@ version: '3.7' services: metasearch2: build: + args: + CONFIG: "/usr/local/bin/config.toml" context: . dockerfile: Containerfile network_mode: "host" - restart: unless-stopped + restart: unless-stopped \ No newline at end of file