diff options
| author | Felix Ableitner <me@nutomic.com> | 2020-01-01 18:01:49 +0100 |
|---|---|---|
| committer | Felix Ableitner <me@nutomic.com> | 2020-01-01 18:14:09 +0100 |
| commit | 62ba018b190c54d30a4436721931aea0b5eedb2e (patch) | |
| tree | f9005a6d3241d29e5168b25c77cde1315ae2b85d | |
| parent | 77847ab3e6876cb4b98986be80ec81410aa63399 (diff) | |
Include docs in docker image
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | docker/dev/Dockerfile | 9 | ||||
| -rw-r--r-- | docs/src/SUMMARY.md | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/.dockerignore b/.dockerignore index 03466f0a..73c47554 100644 --- 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 d62e7b27..761d8cc3 100644 --- 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 9fc0fa87..d8916974 100644 --- 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) |