Include docs in docker image

diff --git a/.dockerignore b/.dockerignore
index 03466f0a3f5c3274bd7f76631a6deff67609365f..73c4755425c8979b70d81c068008497645e74d07 100644 (file)
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
 ui/node_modules
 ui/dist
 server/target
-docs
 .git

diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index d62e7b279b262aa5a185b6f51591a105559aeffd..761d8cc3c75292b4a56770e19470d01ef03e8849 100644 (file)
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -32,6 +32,14 @@ RUN cargo build --frozen --release
 # Get diesel-cli on there just in case
 # RUN cargo install diesel_cli --no-default-features --features postgres
 
+
+FROM ekidd/rust-musl-builder:1.38.0-openssl11 as docs
+WORKDIR /app
+COPY docs ./docs
+RUN sudo chown -R rust:rust .
+RUN mdbook build docs/
+
+
 FROM alpine:3.10
 
 # Install libpq for postgres
@@ -40,6 +48,7 @@ RUN apk add libpq
 # Copy resources
 COPY server/config/defaults.hjson /config/defaults.hjson
 COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/release/lemmy_server /app/lemmy
+COPY --from=docs /app/docs/book/ /app/dist/documentation/
 COPY --from=node /app/ui/dist /app/dist
 
 RUN addgroup -g 1000 lemmy

diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
index 9fc0fa87c393999e2645ea7163cd0494f86bcde5..d891697464c95745699ee86215c9a262373e60e9 100644 (file)
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -10,7 +10,6 @@
   - [Install with Kubernetes](administration_install_kubernetes.md)
   - [Configuration](administration_configuration.md)
 - [Contributing](contributing.md)
-  - [Translations](contributing_translations.md)
   - [Docker Development](contributing_docker_development.md)
   - [Local Development](contributing_local_development.md)
   - [Websocket API](contributing_websocket_api.md)