From fec77d583f9f05394fe0cf43daccefb7bf4e92e0 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Sat, 9 Jan 2021 17:54:31 +0100 Subject: [PATCH] Include fix for mdbook xss vulnerability --- docker/dev/Dockerfile | 5 +++-- docker/dev/volume_mount.dockerfile | 4 ++-- docker/prod/Dockerfile | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 01c3c75b8..292ff903d 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -46,9 +46,10 @@ RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_serv # Build the docs FROM $RUST_BUILDER_IMAGE as docs WORKDIR /app -RUN cargo install mdbook --git https://github.com/Ruin0x11/mdBook.git \ - --branch localization --rev d06249b --force +RUN cargo install mdbook --git https://github.com/Nutomic/mdBook.git \ + --branch localization --rev 0982a82 --force COPY --chown=rust:rust docs ./docs +RUN ls -la docs/ RUN mdbook build docs/ # The alpine runner diff --git a/docker/dev/volume_mount.dockerfile b/docker/dev/volume_mount.dockerfile index 6e25dd7e7..a6724a868 100644 --- a/docker/dev/volume_mount.dockerfile +++ b/docker/dev/volume_mount.dockerfile @@ -17,8 +17,8 @@ RUN --mount=type=cache,target=/app/target \ FROM rust:1.47-buster as docs WORKDIR /app -RUN cargo install mdbook --git https://github.com/Ruin0x11/mdBook.git \ - --branch localization --rev d06249b --force +RUN cargo install mdbook --git https://github.com/Nutomic/mdBook.git \ + --branch localization --rev 0982a82 --force COPY docs ./docs RUN mdbook build docs/ diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index 9a1206833..34921161b 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -46,8 +46,8 @@ RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_serv # Build the docs FROM $RUST_BUILDER_IMAGE as docs WORKDIR /app -RUN cargo install mdbook --git https://github.com/Ruin0x11/mdBook.git \ - --branch localization --rev d06249b --force +RUN cargo install mdbook --git https://github.com/Nutomic/mdBook.git \ + --branch localization --rev 0982a82 --force COPY --chown=rust:rust docs ./docs RUN mdbook build docs/