From a21737e2b7f8d1e426726bdd7536033f299d476a Mon Sep 17 00:00:00 2001
From: Ellie Huxtable <e@elm.sh>
Date: Tue, 20 Apr 2021 21:53:07 +0100
Subject: Use cargo workspaces (#37)

* Switch to Cargo workspaces

Breaking things into "client", "server" and "common" makes managing the
codebase much easier!

client - anything running on a user's machine for adding history
server - handles storing/syncing history and running a HTTP server
common - request/response API definitions, common utils, etc

* Update dockerfile
---
 Dockerfile | 53 ++++++++++++++++++++++-------------------------------
 1 file changed, 22 insertions(+), 31 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 0c19ef6d..e7125414 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,22 @@
-FROM rust:1.51-buster as builder
-
-RUN cargo new --bin atuin
-WORKDIR /atuin
-COPY ./Cargo.toml ./Cargo.toml
-COPY ./Cargo.lock ./Cargo.lock
-
-RUN cargo build --release
-
-RUN rm src/*.rs
-
-ADD . ./
-
-RUN rm ./target/release/deps/atuin*
-RUN cargo build --release
-
-FROM debian:buster-slim
-
-RUN apt-get update \
-    && apt-get install -y ca-certificates tzdata libpq-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-EXPOSE 8888
-
-ENV TZ=Etc/UTC
-ENV RUST_LOG=info
-ENV ATUIN_CONFIG=/config/config.toml
-
-COPY --from=builder /atuin/target/release/atuin ./atuin
-
-ENTRYPOINT ["./atuin"]
+FROM lukemathwalker/cargo-chef as planner
+WORKDIR app
+COPY . .
+RUN cargo chef prepare  --recipe-path recipe.json
+
+FROM lukemathwalker/cargo-chef as cacher
+WORKDIR app
+COPY --from=planner /app/recipe.json recipe.json
+RUN cargo chef cook --release --recipe-path recipe.json
+
+FROM rust as builder
+WORKDIR app
+COPY . .
+# Copy over the cached dependencies
+COPY --from=cacher /app/target target
+COPY --from=cacher $CARGO_HOME $CARGO_HOME
+RUN cargo build --release --bin atuin
+
+FROM debian:buster-slim as runtime
+WORKDIR app
+COPY --from=builder /app/target/release/atuin /usr/local/bin
+ENTRYPOINT ["/usr/local/bin/atuin"]
-- 
cgit v1.3.1