Isomorphic docker (#1124)

[lemmy.git] / docker / dev / Dockerfile

diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index 4445e4febdf3e86c15f1d9d09c95536822a2a7a8..d9a95c85c873c6a0131896f052cd55111f448002 100644 (file)
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -1,42 +1,41 @@
-FROM node:10-jessie as node
-
-WORKDIR /app/ui
-
-# Cache deps
-COPY ui/package.json ui/yarn.lock ./
-RUN yarn install --pure-lockfile
-
-# Build 
-COPY ui /app/ui
-RUN yarn build
-
-FROM ekidd/rust-musl-builder:1.42.0-openssl11 as rust
+FROM ekidd/rust-musl-builder:nightly-2020-05-07 as rust
 
 # Cache deps
 WORKDIR /app
 RUN sudo chown -R rust:rust .
 RUN USER=root cargo new server
+
+# Install cargo-build-deps
+RUN cargo install --git https://github.com/romac/cargo-build-deps.git
 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 .
-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
-RUN cargo build
-RUN rm -f ./target/x86_64-unknown-linux-musl/release/deps/lemmy_server*
-COPY server/src ./src/
-COPY server/lemmy_db ./lemmy_db/
-COPY server/lemmy_utils ./lemmy_utils/
-COPY server/migrations ./migrations/
+RUN mkdir -p lemmy_db/src/ \
+      lemmy_utils/src/ \
+      lemmy_api_structs/src/ \
+      lemmy_rate_limit/src/ \
+      lemmy
+
+# Copy the cargo tomls
+COPY Cargo.toml Cargo.lock ./
+COPY lemmy_db/Cargo.toml ./lemmy_db/
+COPY lemmy_utils/Cargo.toml ./lemmy_utils/
+COPY lemmy_api_structs/Cargo.toml ./lemmy_api_structs/
+COPY lemmy_rate_limit/Cargo.toml ./lemmy_rate_limit/
+
+# Cache the deps
+RUN cargo build-deps
+
+# Copy the src folders
+COPY src ./src/
+COPY lemmy_db/src ./lemmy_db/src/
+COPY lemmy_utils/src/ ./lemmy_utils/src/
+COPY lemmy_api_structs/src/ ./lemmy_api_structs/src/
+COPY lemmy_rate_limit/src/ ./lemmy_rate_limit/src/
+COPY migrations ./migrations/
 
 # Build for debug
 RUN cargo build
 
-FROM ekidd/rust-musl-builder:1.42.0-openssl11 as docs
+FROM ekidd/rust-musl-builder:nightly-2020-05-07 as docs
 WORKDIR /app
 COPY docs ./docs
 RUN sudo chown -R rust:rust .
@@ -47,11 +46,13 @@ FROM alpine:3.12
 # Install libpq for postgres
 RUN apk add libpq
 
+# Install Espeak for captchas
+RUN apk add espeak
+
 # Copy resources
-COPY server/config/defaults.hjson /config/defaults.hjson
+COPY config/defaults.hjson /config/defaults.hjson
 COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/debug/lemmy_server /app/lemmy
-COPY --from=docs /app/docs/book/ /app/dist/documentation/
-COPY --from=node /app/ui/dist /app/dist
+COPY --from=docs /app/docs/book/ /app/documentation/
 
 RUN addgroup -g 1000 lemmy
 RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy