Moving docs to join.lemmy.ml . Fixes #1396 (#1410)

[lemmy.git] / docker / prod / Dockerfile

diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 2ba5bca7075ceeb6ffc6f749dabe973c9f5ecc42..8f307bf6026d918736bca90d877e8f85244f0be3 100644 (file)
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -1,41 +1,49 @@
-ARG RUST_BUILDER_IMAGE=shtripok/rust-musl-builder:arm
+ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.47.0
 
-FROM $RUST_BUILDER_IMAGE as rust
+# Cargo chef plan
+FROM $RUST_BUILDER_IMAGE as planner
+WORKDIR /app
+RUN cargo install cargo-chef --version 0.1.6
+
+# Copy dirs
+COPY ./ ./
+
+RUN sudo chown -R rust:rust .
+RUN cargo chef prepare --recipe-path recipe.json
+
+# Cargo chef cache dependencies
+FROM $RUST_BUILDER_IMAGE as cacher
+ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
+WORKDIR /app
+RUN cargo install cargo-chef --version 0.1.6
+COPY --from=planner /app/recipe.json ./recipe.json
+RUN sudo chown -R rust:rust .
+RUN cargo chef cook --release --target ${CARGO_BUILD_TARGET} --recipe-path recipe.json
 
-#ARG RUSTRELEASEDIR="debug"
+# Build the project
+FROM $RUST_BUILDER_IMAGE as builder
+
+ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
 ARG RUSTRELEASEDIR="release"
 
-# Cache deps
 WORKDIR /app
+
+# Copy over the cached dependencies
+COPY --from=cacher /app/target target
+COPY --from=cacher /home/rust/.cargo /home/rust/.cargo
+
+# Copy the rest of the dirs
+COPY ./ ./
+
 RUN sudo chown -R rust:rust .
-RUN USER=root cargo new server
-WORKDIR /app/server
-COPY Cargo.toml Cargo.lock ./
-COPY lemmy_db ./lemmy_db
-COPY lemmy_utils ./lemmy_utils
-COPY lemmy_api_structs ./lemmy_api_structs
-COPY lemmy_rate_limit ./lemmy_rate_limit
-RUN mkdir -p ./src/bin \
-   && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
 RUN cargo build --release
-RUN find target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR -type f -name "$(echo "lemmy_server" | tr '-' '_')*" -exec touch -t 200001010000 {} +
-COPY src ./src/
-COPY migrations ./migrations/
-
-# build for release
-# workaround for https://github.com/rust-lang/rust/issues/62896
-RUN cargo build --frozen --release
 
 # reduce binary size
 RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
 
-RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/server/
-
-FROM $RUST_BUILDER_IMAGE as docs
-WORKDIR /app
-COPY --chown=rust:rust docs ./docs
-RUN mdbook build docs/
+RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_server
 
+# The alpine runner
 FROM alpine:3.12 as lemmy
 
 # Install libpq for postgres
@@ -49,8 +57,7 @@ RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
 
 # Copy resources
 COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson
-COPY --chown=lemmy:lemmy --from=rust /app/server/lemmy_server /app/lemmy
-COPY --chown=lemmy:lemmy --from=docs /app/docs/book/ /app/documentation/
+COPY --chown=lemmy:lemmy --from=builder /app/lemmy_server /app/lemmy
 
 RUN chown lemmy:lemmy /app/lemmy
 USER lemmy