X-Git-Url: http://these/git/?a=blobdiff_plain;f=docker%2Fdev%2FDockerfile;h=d9a95c85c873c6a0131896f052cd55111f448002;hb=5c6258390c46159c16f49295314c6519215fc6ae;hp=dce2dc5b82ec503aedf038e9d51e38ff4043cc66;hpb=b69524b498983da636b3a31f5acb74fbb1f13ab4;p=lemmy.git

diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index dce2dc5b..d9a95c85 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -1,15 +1,3 @@
-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:nightly-2020-05-07 as rust
 
 # Cache deps
@@ -27,22 +15,22 @@ RUN mkdir -p lemmy_db/src/ \
       lemmy
 
 # Copy the cargo tomls
-COPY server/Cargo.toml server/Cargo.lock ./
-COPY server/lemmy_db/Cargo.toml ./lemmy_db/
-COPY server/lemmy_utils/Cargo.toml ./lemmy_utils/
-COPY server/lemmy_api_structs/Cargo.toml ./lemmy_api_structs/
-COPY server/lemmy_rate_limit/Cargo.toml ./lemmy_rate_limit/
+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 server/src ./src/
-COPY server/lemmy_db/src ./lemmy_db/src/
-COPY server/lemmy_utils/src/ ./lemmy_utils/src/
-COPY server/lemmy_api_structs/src/ ./lemmy_api_structs/src/
-COPY server/lemmy_rate_limit/src/ ./lemmy_rate_limit/src/
-COPY server/migrations ./migrations/
+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
@@ -62,10 +50,9 @@ RUN apk add libpq
 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