Isomorphic docker (#1124)

[lemmy.git] / docker / prod / Dockerfile

diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 9bccb4489755c63f286c3c1e1ca81541bebec567..2ba5bca7075ceeb6ffc6f749dabe973c9f5ecc42 100644 (file)
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -10,17 +10,17 @@ WORKDIR /app
 RUN sudo chown -R rust:rust .
 RUN USER=root cargo new server
 WORKDIR /app/server
-COPY server/Cargo.toml server/Cargo.lock ./
-COPY server/lemmy_db ./lemmy_db
-COPY server/lemmy_utils ./lemmy_utils
-COPY server/lemmy_api_structs ./lemmy_api_structs
-COPY server/lemmy_rate_limit ./lemmy_rate_limit
+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 server/src ./src/
-COPY server/migrations ./migrations/
+COPY src ./src/
+COPY migrations ./migrations/
 
 # build for release
 # workaround for https://github.com/rust-lang/rust/issues/62896
@@ -36,18 +36,6 @@ WORKDIR /app
 COPY --chown=rust:rust docs ./docs
 RUN mdbook build docs/
 
-FROM node:12-buster as node
-
-WORKDIR /app/ui
-
-# Cache deps
-COPY ui/package.json ui/yarn.lock ./
-RUN yarn install --pure-lockfile --network-timeout 600000
-
-# Build
-COPY ui /app/ui
-RUN yarn build
-
 FROM alpine:3.12 as lemmy
 
 # Install libpq for postgres
@@ -60,10 +48,9 @@ RUN addgroup -g 1000 lemmy
 RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
 
 # Copy resources
-COPY --chown=lemmy:lemmy server/config/defaults.hjson /config/defaults.hjson
+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/dist/documentation/
-COPY --chown=lemmy:lemmy --from=node /app/ui/dist /app/dist
+COPY --chown=lemmy:lemmy --from=docs /app/docs/book/ /app/documentation/
 
 RUN chown lemmy:lemmy /app/lemmy
 USER lemmy