From: Dessalines <dessalines@users.noreply.github.com>
Date: Mon, 13 Jul 2020 16:31:06 +0000 (-0400)
Subject: Adding docker workspace caching. Fixes #940 (#958)
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/readmes/%7B%7D/%22%7Burl%7D/%7BcanonicalUrl%7D?a=commitdiff_plain;h=22a33929e26299695fd4ea113401851d4faa852f;p=lemmy.git

Adding docker workspace caching. Fixes #940 (#958)
---

diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index 4445e4fe..b86618d8 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -17,20 +17,14 @@ WORKDIR /app
 RUN sudo chown -R rust:rust .
 RUN USER=root cargo new server
 WORKDIR /app/server
-RUN mkdir -p lemmy_db/src/ lemmy_utils/src/
 COPY server/Cargo.toml server/Cargo.lock ./
-COPY server/lemmy_db/Cargo.toml ./lemmy_db/
-COPY server/lemmy_utils/Cargo.toml ./lemmy_utils/
-RUN sudo chown -R rust:rust .
+COPY server/lemmy_db ./lemmy_db
+COPY server/lemmy_utils ./lemmy_utils
 RUN mkdir -p ./src/bin \
-   && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs \
-   && cp ./src/bin/main.rs ./lemmy_db/src/main.rs \
-   && cp ./src/bin/main.rs ./lemmy_utils/src/main.rs
+   && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
 RUN cargo build
-RUN rm -f ./target/x86_64-unknown-linux-musl/release/deps/lemmy_server*
+RUN find target/debug -type f -name "$(echo "lemmy_server" | tr '-' '_')*" -exec touch -t 200001010000 {} +
 COPY server/src ./src/
-COPY server/lemmy_db ./lemmy_db/
-COPY server/lemmy_utils ./lemmy_utils/
 COPY server/migrations ./migrations/
 
 # Build for debug
diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 9000ca3a..77438740 100644
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -10,20 +10,15 @@ WORKDIR /app
 RUN sudo chown -R rust:rust .
 RUN USER=root cargo new server
 WORKDIR /app/server
-RUN mkdir -p lemmy_db/src/ lemmy_utils/src/
-COPY --chown=rust:rust server/Cargo.toml server/Cargo.lock ./
-COPY --chown=rust:rust server/lemmy_db/Cargo.toml ./lemmy_db/
-COPY --chown=rust:rust server/lemmy_utils/Cargo.toml ./lemmy_utils/
+COPY server/Cargo.toml server/Cargo.lock ./
+COPY server/lemmy_db ./lemmy_db
+COPY server/lemmy_utils ./lemmy_utils
 RUN mkdir -p ./src/bin \
-   && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs \
-   && cp ./src/bin/main.rs ./lemmy_db/src/main.rs \
-   && cp ./src/bin/main.rs ./lemmy_utils/src/main.rs
+   && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
 RUN cargo build --release
-RUN rm -f ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/deps/lemmy_server*
-COPY --chown=rust:rust server/src ./src/
-COPY --chown=rust:rust server/lemmy_db ./lemmy_db/
-COPY --chown=rust:rust server/lemmy_utils ./lemmy_utils/
-COPY --chown=rust:rust server/migrations ./migrations/
+RUN find target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR -type f -name "$(echo "lemmy_server" | tr '-' '_')*" -exec touch -t 200001010000 {} +
+COPY server/src ./src/
+COPY server/migrations ./migrations/
 
 # build for release
 # workaround for https://github.com/rust-lang/rust/issues/62896