mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-27 10:20:34 +00:00
Merge remote-tracking branch 'yerba/move_views_to_diesel' into move_views_to_diesel
This commit is contained in:
commit
39001af9a0
3 changed files with 7 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -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/
|
||||
|
||||
|
|
|
@ -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/
|
||||
|
||||
|
|
Loading…
Reference in a new issue