Merge pull request #144 from neon-mmd/patch-and-improve-dockerfile

Patch and improve the `Docker` deployment process
neon-mmd · Jul 11, 2023 · e4625c3 · e4625c3
2 parents c5db7cc + a0565f1
commit e4625c3
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "websurfx"
-version = "0.13.16"
+version = "0.13.17"
 edition = "2021"
 description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind."
 repository = "https://github.com/neon-mmd/websurfx"

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM rust:latest AS chef
 # it will be cached from the second build onwards
 RUN cargo install cargo-chef
 
-WORKDIR app
+WORKDIR /app
 
 FROM chef AS planner
 COPY . . 
@@ -20,7 +20,7 @@ RUN cargo install --path .
 
 # We do not need the Rust toolchain to run the binary!
 FROM gcr.io/distroless/cc-debian11
-COPY --from=builder ./public/ ./public/
-COPY --from=builder ./websurfx/ ./websurfx/
+COPY --from=builder /app/public/ /opt/websurfx/public/
+COPY --from=builder /app/websurfx/config.lua /etc/xdg/websurfx/config.lua
 COPY --from=builder /usr/local/cargo/bin/* /usr/local/bin/
 CMD ["websurfx"]