gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include fix for mdbook xss vulnerability

pull/1349/head
Felix Ableitner 2021-01-09 17:54:31 +01:00
parent 7a97fc370b
commit fec77d583f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/dev/Dockerfile
View File

@ -46,9 +46,10 @@ RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_serv
# Build the docs # Build the docs
FROM $RUST_BUILDER_IMAGE as docs FROM $RUST_BUILDER_IMAGE as docs
WORKDIR /app WORKDIR /app
RUN cargo install mdbook --git https://github.com/Ruin0x11/mdBook.git \ RUN cargo install mdbook --git https://github.com/Nutomic/mdBook.git \
--branch localization --rev d06249b --force --branch localization --rev 0982a82 --force
COPY --chown=rust:rust docs ./docs COPY --chown=rust:rust docs ./docs
RUN ls -la docs/
RUN mdbook build docs/ RUN mdbook build docs/
# The alpine runner # The alpine runner

4
docker/dev/volume_mount.dockerfile
View File

@ -17,8 +17,8 @@ RUN --mount=type=cache,target=/app/target \
FROM rust:1.47-buster as docs FROM rust:1.47-buster as docs
WORKDIR /app WORKDIR /app
RUN cargo install mdbook --git https://github.com/Ruin0x11/mdBook.git \ RUN cargo install mdbook --git https://github.com/Nutomic/mdBook.git \
--branch localization --rev d06249b --force --branch localization --rev 0982a82 --force
COPY docs ./docs COPY docs ./docs
RUN mdbook build docs/ RUN mdbook build docs/

4
docker/prod/Dockerfile
View File

@ -46,8 +46,8 @@ RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_serv
# Build the docs # Build the docs
FROM $RUST_BUILDER_IMAGE as docs FROM $RUST_BUILDER_IMAGE as docs
WORKDIR /app WORKDIR /app
RUN cargo install mdbook --git https://github.com/Ruin0x11/mdBook.git \ RUN cargo install mdbook --git https://github.com/Nutomic/mdBook.git \
--branch localization --rev d06249b --force --branch localization --rev 0982a82 --force
COPY --chown=rust:rust docs ./docs COPY --chown=rust:rust docs ./docs
RUN mdbook build docs/ RUN mdbook build docs/