diff options
author | Felix Ableitner <me@nutomic.com> | 2020-06-12 15:29:50 +0200 |
---|---|---|
committer | Felix Ableitner <me@nutomic.com> | 2020-06-12 21:45:23 +0200 |
commit | 4ea6c4ad5d1cac14d63f758f8fa6909b77a0b758 (patch) | |
tree | 54c097601c722bfc3ade4c14e1e269b9d4d90494 /docker | |
parent | 1b0212377df2e56c4e950a4abbf8c594daabc73a (diff) |
Various build optimizations
Diffstat (limited to 'docker')
-rw-r--r-- | docker/dev/Dockerfile | 12 | ||||
-rwxr-xr-x | docker/dev/docker_update.sh | 4 | ||||
-rwxr-xr-x | docker/dev/test_deploy.sh | 4 | ||||
-rw-r--r-- | docker/prod/Dockerfile | 58 | ||||
-rw-r--r-- | docker/prod/Dockerfile.aarch64 (renamed from docker/dev/Dockerfile.aarch64) | 5 | ||||
-rw-r--r-- | docker/prod/Dockerfile.armv7hf (renamed from docker/dev/Dockerfile.armv7hf) | 6 | ||||
-rw-r--r-- | docker/prod/Dockerfile.libc (renamed from docker/dev/Dockerfile.libc) | 4 | ||||
-rwxr-xr-x | docker/prod/deploy.sh (renamed from docker/dev/deploy.sh) | 6 |
8 files changed, 85 insertions, 14 deletions
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index d9ffc2f3..fbec2536 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -21,17 +21,13 @@ COPY server/Cargo.toml server/Cargo.lock ./ RUN sudo chown -R rust:rust . RUN mkdir -p ./src/bin \ && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs -RUN cargo build --release +RUN cargo build RUN rm -f ./target/x86_64-unknown-linux-musl/release/deps/lemmy_server* COPY server/src ./src/ COPY server/migrations ./migrations/ -# Build for release -RUN cargo build --frozen --release - -# Get diesel-cli on there just in case -# RUN cargo install diesel_cli --no-default-features --features postgres - +# Build for debug +RUN cargo build FROM ekidd/rust-musl-builder:1.42.0-openssl11 as docs WORKDIR /app @@ -47,7 +43,7 @@ RUN apk add libpq # Copy resources COPY server/config/defaults.hjson /config/defaults.hjson -COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/release/lemmy_server /app/lemmy +COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/debug/lemmy_server /app/lemmy COPY --from=docs /app/docs/book/ /app/dist/documentation/ COPY --from=node /app/ui/dist /app/dist diff --git a/docker/dev/docker_update.sh b/docker/dev/docker_update.sh index 9d0f4542..21e92ba8 100755 --- a/docker/dev/docker_update.sh +++ b/docker/dev/docker_update.sh @@ -1,2 +1,6 @@ #!/bin/sh +set -e + +export COMPOSE_DOCKER_CLI_BUILD=1 +export DOCKER_BUILDKIT=1 docker-compose up -d --no-deps --build diff --git a/docker/dev/test_deploy.sh b/docker/dev/test_deploy.sh index 1ae91f65..ce85f60c 100755 --- a/docker/dev/test_deploy.sh +++ b/docker/dev/test_deploy.sh @@ -1,4 +1,8 @@ #!/bin/sh +set -e + +export COMPOSE_DOCKER_CLI_BUILD=1 +export DOCKER_BUILDKIT=1 # Rebuilding dev docker docker-compose build diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile new file mode 100644 index 00000000..b9eec456 --- /dev/null +++ b/docker/prod/Dockerfile @@ -0,0 +1,58 @@ +FROM node:10-jessie as node + +WORKDIR /app/ui + +# Cache deps +COPY ui/package.json ui/yarn.lock ./ +RUN yarn install --pure-lockfile + +# Build +COPY ui /app/ui +RUN yarn build + +FROM ekidd/rust-musl-builder:1.42.0-openssl11 as rust + +# Cache deps +WORKDIR /app +RUN sudo chown -R rust:rust . +RUN USER=root cargo new server +WORKDIR /app/server +COPY server/Cargo.toml server/Cargo.lock ./ +RUN sudo chown -R rust:rust . +RUN mkdir -p ./src/bin \ + && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs +RUN cargo build --release +RUN rm -f ./target/x86_64-unknown-linux-musl/release/deps/lemmy_server* +COPY server/src ./src/ +COPY server/migrations ./migrations/ + +# Build for release +RUN cargo build --frozen --release + +# reduce binary size +RUN strip /app/server/target/x86_64-unknown-linux-musl/release/lemmy_server + +FROM ekidd/rust-musl-builder:1.42.0-openssl11 as docs +WORKDIR /app +COPY docs ./docs +RUN sudo chown -R rust:rust . +RUN mdbook build docs/ + + +FROM alpine:3.10 + +# Install libpq for postgres +RUN apk add libpq + +# Copy resources +COPY server/config/defaults.hjson /config/defaults.hjson +COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/release/lemmy_server /app/lemmy +COPY --from=docs /app/docs/book/ /app/dist/documentation/ +COPY --from=node /app/ui/dist /app/dist + +RUN addgroup -g 1000 lemmy +RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy +RUN chown lemmy:lemmy /app/lemmy +USER lemmy +EXPOSE 8536 +CMD ["/app/lemmy"] diff --git a/docker/dev/Dockerfile.aarch64 b/docker/prod/Dockerfile.aarch64 index 9636a590..7a1c833f 100644 --- a/docker/dev/Dockerfile.aarch64 +++ b/docker/prod/Dockerfile.aarch64 @@ -40,10 +40,11 @@ COPY server/src ./src/ COPY server/migrations ./migrations/ RUN rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server* - # build for release RUN cargo build --frozen --release -# RUN cargo build --frozen + +# reduce binary size +RUN strip /app/server/target/release/lemmy_server # Get diesel-cli on there just in case # RUN cargo install diesel_cli --no-default-features --features postgres diff --git a/docker/dev/Dockerfile.armv7hf b/docker/prod/Dockerfile.armv7hf index c2c9084c..efd937a3 100644 --- a/docker/dev/Dockerfile.armv7hf +++ b/docker/prod/Dockerfile.armv7hf @@ -43,8 +43,10 @@ RUN rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_ # build for release -#RUN cargo build --frozen --release -RUN cargo build --frozen +RUN cargo build --frozen --release + +# reduce binary size +RUN strip /app/server/target/debug/lemmy_server # Get diesel-cli on there just in case # RUN cargo install diesel_cli --no-default-features --features postgres diff --git a/docker/dev/Dockerfile.libc b/docker/prod/Dockerfile.libc index 6348342f..9c750282 100644 --- a/docker/dev/Dockerfile.libc +++ b/docker/prod/Dockerfile.libc @@ -43,7 +43,9 @@ COPY server/migrations ./migrations/ # 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 + +# reduce binary size +RUN strip /app/server/target/release/lemmy_server # Get diesel-cli on there just in case # RUN cargo install diesel_cli --no-default-features --features postgres diff --git a/docker/dev/deploy.sh b/docker/prod/deploy.sh index 09b21b0b..0ad47bcd 100755 --- a/docker/dev/deploy.sh +++ b/docker/prod/deploy.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e git checkout master # Import translations @@ -20,7 +21,7 @@ git add "server/src/version.rs" echo $new_tag > "ansible/VERSION" git add "ansible/VERSION" -cd docker/dev || exit +cd docker/prod || exit # Changing the docker-compose prod sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml @@ -32,6 +33,9 @@ git add ../../ansible/templates/docker-compose.yml git commit -m"Version $new_tag" git tag $new_tag +export COMPOSE_DOCKER_CLI_BUILD=1 +export DOCKER_BUILDKIT=1 + # Rebuilding docker docker-compose build docker tag dev_lemmy:latest dessalines/lemmy:x64-$new_tag |