mirror of
https://github.com/LemmyNet/lemmy
synced 2024-11-22 20:43:05 +00:00
Trying out cargo chef and a travis docker image cache. (#1238)
* Trying out cargo chef and a travis docker image cache. * trying to change internal target. * Use latest cargo-chef with --target * Remove caching for now. * Adding back in chowns * Adding back in cache. * Remove travis caching. * Switching dev dockerfile to match prod, using cargo-chef and alpine. * Make travis happy * Trying a chown rust. * Caching cargo-chef first. * Moving the chowns * Removing many copy commands. * Go back to rust 1.47.0 due to config-rs breaking. * Adding the old volume mount version. * Adding some script comments. Co-authored-by: Luca Palmieri <lpalmieri@truelayer.com>
This commit is contained in:
parent
d75f621152
commit
2b5feca806
6 changed files with 148 additions and 31 deletions
|
@ -1,8 +1,8 @@
|
|||
# build folders and similar which are not needed for the docker build
|
||||
target
|
||||
docker/dev/volumes
|
||||
docker/prod/volumes
|
||||
docker/federation/volumes
|
||||
docker/travis/volumes
|
||||
.git
|
||||
docker
|
||||
api_tests
|
||||
ansible
|
||||
tests
|
||||
.git
|
||||
*.sh
|
||||
|
|
|
@ -1,35 +1,72 @@
|
|||
# syntax=docker/dockerfile:experimental
|
||||
FROM rust:1.47-buster as rust
|
||||
ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.47.0
|
||||
|
||||
ENV HOME=/home/root
|
||||
# Cargo chef plan
|
||||
FROM $RUST_BUILDER_IMAGE as planner
|
||||
WORKDIR /app
|
||||
RUN cargo install cargo-chef --version 0.1.6
|
||||
|
||||
# Copy dirs
|
||||
COPY ./ ./
|
||||
|
||||
RUN sudo chown -R rust:rust .
|
||||
RUN cargo chef prepare --recipe-path recipe.json
|
||||
|
||||
# Cargo chef cache dependencies
|
||||
FROM $RUST_BUILDER_IMAGE as cacher
|
||||
ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
|
||||
WORKDIR /app
|
||||
RUN cargo install cargo-chef --version 0.1.6
|
||||
COPY --from=planner /app/recipe.json ./recipe.json
|
||||
RUN sudo chown -R rust:rust .
|
||||
RUN cargo chef cook --target ${CARGO_BUILD_TARGET} --recipe-path recipe.json
|
||||
|
||||
# Build the project
|
||||
FROM $RUST_BUILDER_IMAGE as builder
|
||||
|
||||
ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
|
||||
ARG RUSTRELEASEDIR="debug"
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Copy the source folders
|
||||
COPY . ./
|
||||
# Copy over the cached dependencies
|
||||
COPY --from=cacher /app/target target
|
||||
COPY --from=cacher /home/rust/.cargo /home/rust/.cargo
|
||||
|
||||
# Build for debug
|
||||
RUN --mount=type=cache,target=/usr/local/cargo/registry \
|
||||
--mount=type=cache,target=/app/target \
|
||||
cargo build
|
||||
RUN --mount=type=cache,target=/app/target \
|
||||
cp target/debug/lemmy_server lemmy_server
|
||||
# Copy the rest of the dirs
|
||||
COPY ./ ./
|
||||
|
||||
FROM peaceiris/mdbook:v0.3.7 as docs
|
||||
RUN sudo chown -R rust:rust .
|
||||
RUN cargo build
|
||||
|
||||
# reduce binary size
|
||||
RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
|
||||
|
||||
RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_server
|
||||
|
||||
# Build the docs
|
||||
FROM $RUST_BUILDER_IMAGE as docs
|
||||
WORKDIR /app
|
||||
COPY docs ./docs
|
||||
COPY --chown=rust:rust docs ./docs
|
||||
RUN mdbook build docs/
|
||||
|
||||
FROM ubuntu:20.10
|
||||
# The alpine runner
|
||||
FROM alpine:3.12 as lemmy
|
||||
|
||||
# Install libpq for postgres and espeak
|
||||
RUN apt-get update -y
|
||||
RUN apt-get install -y libpq-dev espeak
|
||||
# Install libpq for postgres
|
||||
RUN apk add libpq
|
||||
|
||||
# Install Espeak for captchas
|
||||
RUN apk add espeak
|
||||
|
||||
RUN addgroup -g 1000 lemmy
|
||||
RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
||||
|
||||
# Copy resources
|
||||
COPY config/defaults.hjson /config/defaults.hjson
|
||||
COPY --from=rust /app/lemmy_server /app/lemmy
|
||||
COPY --from=docs /app/docs/book/ /app/documentation/
|
||||
COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson
|
||||
COPY --chown=lemmy:lemmy --from=builder /app/lemmy_server /app/lemmy
|
||||
COPY --chown=lemmy:lemmy --from=docs /app/docs/book/ /app/documentation/
|
||||
|
||||
RUN chown lemmy:lemmy /app/lemmy
|
||||
USER lemmy
|
||||
EXPOSE 8536
|
||||
CMD ["/app/lemmy"]
|
||||
|
|
|
@ -1,4 +1,8 @@
|
|||
#!/bin/sh
|
||||
|
||||
# This script uses a docker file that builds with musl, and runs on linux alpine
|
||||
# Its a bit slower for development than the volume mount.
|
||||
|
||||
set -e
|
||||
|
||||
mkdir -p volumes/pictrs
|
||||
|
|
11
docker/dev/docker_update_volume_mount.sh
Executable file
11
docker/dev/docker_update_volume_mount.sh
Executable file
|
@ -0,0 +1,11 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# This script uses a Dockerfile that takes advantage of docker volume mounts,
|
||||
# And runs on an ubuntu image. A little faster for development than the other
|
||||
# script
|
||||
|
||||
mkdir -p volumes/pictrs
|
||||
sudo chown -R 991:991 volumes/pictrs
|
||||
sudo docker build ../../ --file ../dev/volume_mount.dockerfile -t lemmy-dev:latest
|
||||
sudo docker-compose up -d
|
35
docker/dev/volume_mount.dockerfile
Normal file
35
docker/dev/volume_mount.dockerfile
Normal file
|
@ -0,0 +1,35 @@
|
|||
# syntax=docker/dockerfile:experimental
|
||||
FROM rust:1.47-buster as rust
|
||||
|
||||
ENV HOME=/home/root
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Copy the source folders
|
||||
COPY . ./
|
||||
|
||||
# Build for debug
|
||||
RUN --mount=type=cache,target=/usr/local/cargo/registry \
|
||||
--mount=type=cache,target=/app/target \
|
||||
cargo build
|
||||
RUN --mount=type=cache,target=/app/target \
|
||||
cp target/debug/lemmy_server lemmy_server
|
||||
|
||||
FROM peaceiris/mdbook:v0.3.7 as docs
|
||||
WORKDIR /app
|
||||
COPY docs ./docs
|
||||
RUN mdbook build docs/
|
||||
|
||||
FROM ubuntu:20.10
|
||||
|
||||
# Install libpq for postgres and espeak
|
||||
RUN apt-get update -y
|
||||
RUN apt-get install -y libpq-dev espeak
|
||||
|
||||
# Copy resources
|
||||
COPY config/defaults.hjson /config/defaults.hjson
|
||||
COPY --from=rust /app/lemmy_server /app/lemmy
|
||||
COPY --from=docs /app/docs/book/ /app/documentation/
|
||||
|
||||
EXPOSE 8536
|
||||
CMD ["/app/lemmy"]
|
|
@ -1,25 +1,55 @@
|
|||
ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:stable
|
||||
ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.47.0
|
||||
|
||||
FROM $RUST_BUILDER_IMAGE as rust
|
||||
# Cargo chef plan
|
||||
FROM $RUST_BUILDER_IMAGE as planner
|
||||
WORKDIR /app
|
||||
RUN cargo install cargo-chef --version 0.1.6
|
||||
|
||||
# Copy dirs
|
||||
COPY ./ ./
|
||||
|
||||
RUN sudo chown -R rust:rust .
|
||||
RUN cargo chef prepare --recipe-path recipe.json
|
||||
|
||||
# Cargo chef cache dependencies
|
||||
FROM $RUST_BUILDER_IMAGE as cacher
|
||||
ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
|
||||
WORKDIR /app
|
||||
RUN cargo install cargo-chef --version 0.1.6
|
||||
COPY --from=planner /app/recipe.json ./recipe.json
|
||||
RUN sudo chown -R rust:rust .
|
||||
RUN cargo chef cook --release --target ${CARGO_BUILD_TARGET} --recipe-path recipe.json
|
||||
|
||||
# Build the project
|
||||
FROM $RUST_BUILDER_IMAGE as builder
|
||||
|
||||
ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
|
||||
ARG RUSTRELEASEDIR="release"
|
||||
|
||||
WORKDIR /app/server
|
||||
WORKDIR /app
|
||||
|
||||
# Copy over the cached dependencies
|
||||
COPY --from=cacher /app/target target
|
||||
COPY --from=cacher /home/rust/.cargo /home/rust/.cargo
|
||||
|
||||
# Copy the rest of the dirs
|
||||
COPY ./ ./
|
||||
|
||||
RUN sudo chown -R rust:rust .
|
||||
COPY . ./
|
||||
RUN cargo build --release
|
||||
|
||||
# reduce binary size
|
||||
RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
|
||||
|
||||
RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/server/
|
||||
RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_server
|
||||
|
||||
# Build the docs
|
||||
FROM $RUST_BUILDER_IMAGE as docs
|
||||
WORKDIR /app
|
||||
COPY --chown=rust:rust docs ./docs
|
||||
RUN mdbook build docs/
|
||||
|
||||
# The alpine runner
|
||||
FROM alpine:3.12 as lemmy
|
||||
|
||||
# Install libpq for postgres
|
||||
|
@ -33,7 +63,7 @@ RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
|||
|
||||
# Copy resources
|
||||
COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson
|
||||
COPY --chown=lemmy:lemmy --from=rust /app/server/lemmy_server /app/lemmy
|
||||
COPY --chown=lemmy:lemmy --from=builder /app/lemmy_server /app/lemmy
|
||||
COPY --chown=lemmy:lemmy --from=docs /app/docs/book/ /app/documentation/
|
||||
|
||||
RUN chown lemmy:lemmy /app/lemmy
|
||||
|
|
Loading…
Reference in a new issue