From fc001933d10d9ba6e6f560465f5fad915f799c09 Mon Sep 17 00:00:00 2001 From: meeg_leeto Date: Thu, 21 Apr 2022 22:10:14 +0100 Subject: [PATCH] fix: proper env w/ docker compose --- Dockerfile | 9 ++++++--- data/config.json | 3 ++- docker-compose.yml | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd69010..860a501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,15 +8,18 @@ WORKDIR lonk COPY ./Cargo.lock ./Cargo.lock COPY ./Cargo.toml ./Cargo.toml +ARG PROFILE + RUN cargo build RUN rm src/*.rs # Compile the source COPY ./src ./src -RUN rm ./target/release/deps/lonk* +RUN rm ./target/${PROFILE:-release}/deps/lonk* RUN cargo build # Execution container -FROM scratch -COPY --from=build /lonk/target/release/lonk . +FROM rust:latest +ARG PROFILE +COPY --from=builder /lonk/target/${PROFILE:-release}/lonk . CMD ["./lonk"] \ No newline at end of file diff --git a/data/config.json b/data/config.json index 8567be3..1fbfdeb 100644 --- a/data/config.json +++ b/data/config.json @@ -1,6 +1,7 @@ { "db": { - "address": "redis://db" + "address": "redis://db", + "worker_threads": 4 }, "slug_rules": { "length": 5, diff --git a/docker-compose.yml b/docker-compose.yml index 520d7bc..acc3a1a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,12 @@ version: '3.9' services: lonk: - build: . + build: + context: . + args: + PROFILE: debug environment: - LONK_CONFIG="/data/config.json" - - PROFILE="debug" volumes: - ./data:/data redis: