From 1bd3cee6eaff4d8ec01572f329b0ab491e53ed5e Mon Sep 17 00:00:00 2001
From: Philippe Loctaux <p@philippeloctaux.com>
Date: Fri, 14 Jul 2023 16:40:07 +0200
Subject: [PATCH] Dockerfile: follow unix convention for files, use config from
 file instead of env

---
 Dockerfile                | 15 +++++----------
 crates/ezidam/ezidam.toml |  2 ++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 179291f..8573445 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,16 +19,11 @@ COPY logo logo
 RUN cargo build --release --target x86_64-unknown-linux-musl --package ezidam --bin ezidam
 
 FROM alpine:3.17.2
-COPY --from=builder /ezidam/target/x86_64-unknown-linux-musl/release/ezidam /ezidam/ezidam
-COPY crates/ezidam/static /ezidam/static
-COPY crates/ezidam/templates /ezidam/templates
-COPY crates/email/templates /ezidam/email-templates
-ENV ROCKET_CLI_COLORS=0
-ENV ROCKET_ADDRESS=0.0.0.0
-ENV ROCKET_PORT=8000
-ENV ROCKET_DATABASES='{ezidam={url="/ezidam/database/ezidam.sqlite"}}'
+COPY --from=builder /ezidam/target/x86_64-unknown-linux-musl/release/ezidam /usr/bin/ezidam
+COPY crates/ezidam/static /usr/share/ezidam/static
+COPY crates/ezidam/templates /usr/share/ezidam/templates
+COPY crates/email/templates /usr/share/ezidam/email-templates
 EXPOSE 8000
-WORKDIR /ezidam
-ENTRYPOINT ["/ezidam/ezidam"]
+ENTRYPOINT ["/usr/bin/ezidam"]
 
 LABEL maintainer="Philippe Loctaux <p@philippeloctaux.com>"
diff --git a/crates/ezidam/ezidam.toml b/crates/ezidam/ezidam.toml
index 4b3664e..6e25bcd 100644
--- a/crates/ezidam/ezidam.toml
+++ b/crates/ezidam/ezidam.toml
@@ -1,5 +1,7 @@
 [default]
+cli_colors = false
 address = "0.0.0.0"
+port = 8000
 template_dir = "./templates"
 static_dir = "./static"