From a1060e35a719da756b29a87210e7e1798d593eb7 Mon Sep 17 00:00:00 2001 From: Igor Velkov Date: Mon, 3 Feb 2020 01:39:41 +0200 Subject: [PATCH] Add doc compilation to multiplatform workflow Change rust builder version to current --- docker/dev/Dockerfile.libc | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/docker/dev/Dockerfile.libc b/docker/dev/Dockerfile.libc index 6b9b347..5eec389 100644 --- a/docker/dev/Dockerfile.libc +++ b/docker/dev/Dockerfile.libc @@ -20,10 +20,11 @@ COPY ui /app/ui RUN yarn build -FROM rust:1.37 as rust +FROM rust:1.40 as rust # Cache deps WORKDIR /app + RUN USER=root cargo new server WORKDIR /app/server COPY server/Cargo.toml server/Cargo.lock ./ @@ -31,24 +32,35 @@ RUN mkdir -p ./src/bin \ && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs -#RUN cargo build --release -RUN cargo build && \ - rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server* +RUN cargo build --release +#RUN cargo build && \ +# rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server* COPY server/src ./src/ COPY server/migrations ./migrations/ + # build for release # workaround for https://github.com/rust-lang/rust/issues/62896 #RUN RUSTFLAGS='-Ccodegen-units=1' cargo build --release -#RUN cargo build --release --frozen -RUN cargo build --frozen +RUN cargo build --release --frozen +#RUN cargo build --frozen # Get diesel-cli on there just in case # RUN cargo install diesel_cli --no-default-features --features postgres # make result place always the same for lemmy container -#RUN cp /app/server/target/release/lemmy_server /app/server/ready -RUN cp /app/server/target/debug/lemmy_server /app/server/ready +RUN cp /app/server/target/release/lemmy_server /app/server/ready +#RUN cp /app/server/target/debug/lemmy_server /app/server/ready + + +FROM rust:1.40 as docs + +WORKDIR /app + +# Build docs +COPY docs ./docs +RUN cargo install mdbook +RUN mdbook build docs/ #FROM alpine:3.10 @@ -66,8 +78,9 @@ RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy # Copy resources COPY server/config/defaults.hjson /config/defaults.hjson -COPY --from=rust /app/server/ready /app/lemmy COPY --from=node /app/ui/dist /app/dist +COPY --from=docs /app/docs/book/ /app/dist/documentation/ +COPY --from=rust /app/server/ready /app/lemmy RUN chown lemmy:lemmy /app/lemmy USER lemmy