From 346c7630c913bcf95286130e64a1594d8a4235fb Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Fri, 17 Aug 2018 14:30:25 +0100 Subject: [PATCH 1/5] Initial implementation of musl build on top of Alpine --- Dockerfile | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 860e76c7..8e7e43d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,19 +25,11 @@ RUN npm run dist \ && mv build /web-vault ########################## BUILD IMAGE ########################## -# We need to use the Rust build image, because -# we need the Rust compiler and Cargo tooling -FROM rust as build - -# Using bundled SQLite, no need to install it -# RUN apt-get update && apt-get install -y\ -# sqlite3\ -# --no-install-recommends\ -# && rm -rf /var/lib/apt/lists/* +# Musl build image for statically compiled binary +FROM clux/muslrust:nightly-2018-06-26 as build # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app -WORKDIR /app +RUN USER=root cargo init --bin # Copies over *only* your manifests and vendored dependencies COPY ./Cargo.* ./ @@ -61,17 +53,15 @@ RUN cargo build --release ######################## RUNTIME IMAGE ######################## # Create a new stage with a minimal image # because we already have a binary built -FROM debian:stretch-slim +FROM alpine:3.8 ENV ROCKET_ENV "staging" ENV ROCKET_WORKERS=10 # Install needed libraries -RUN apt-get update && apt-get install -y\ +RUN apk add \ openssl\ - ca-certificates\ - --no-install-recommends\ - && rm -rf /var/lib/apt/lists/* + ca-certificates RUN mkdir /data VOLUME /data @@ -82,7 +72,7 @@ EXPOSE 80 COPY .env . COPY Rocket.toml . COPY --from=vault /web-vault ./web-vault -COPY --from=build app/target/release/bitwarden_rs . +COPY --from=build /volume/target/x86_64-unknown-linux-musl/release/bitwarden_rs . # Configures the startup! CMD ./bitwarden_rs From ca8e1c646df058fe7ea92653b57c7a00c604708c Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Fri, 17 Aug 2018 16:32:37 +0100 Subject: [PATCH 2/5] Update build image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8e7e43d1..262d841f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN npm run dist \ ########################## BUILD IMAGE ########################## # Musl build image for statically compiled binary -FROM clux/muslrust:nightly-2018-06-26 as build +FROM clux/muslrust:nightly-2018-07-18 as build # Creates a dummy project used to grab dependencies RUN USER=root cargo init --bin From ef2413a5aa3ca20005558087212ce572b6c26f17 Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Fri, 17 Aug 2018 21:25:08 +0100 Subject: [PATCH 3/5] Fix SSL issue, rm cache --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 262d841f..ed9edbc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,11 +57,13 @@ FROM alpine:3.8 ENV ROCKET_ENV "staging" ENV ROCKET_WORKERS=10 +ENV SSL_CERT_DIR=/etc/ssl/certs # Install needed libraries RUN apk add \ - openssl\ - ca-certificates + openssl\ + ca-certificates \ + && rm /var/cache/apk/* RUN mkdir /data VOLUME /data From ffec0b065ba6091897f7298a63593f73fe1219a5 Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Sat, 25 Aug 2018 09:29:50 +0100 Subject: [PATCH 4/5] Updated build image version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ed9edbc9..95f5724c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN npm run dist \ ########################## BUILD IMAGE ########################## # Musl build image for statically compiled binary -FROM clux/muslrust:nightly-2018-07-18 as build +FROM clux/muslrust:nightly-2018-08-24 as build # Creates a dummy project used to grab dependencies RUN USER=root cargo init --bin From 1a5c1979e3a00515e4b23c0757e6d3379f268146 Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Thu, 30 Aug 2018 10:38:38 +0100 Subject: [PATCH 5/5] Move Alpine Dockerfile to separate file --- Dockerfile | 28 +++++++++++------ Dockerfile.alpine | 80 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 Dockerfile.alpine diff --git a/Dockerfile b/Dockerfile index 3a8b4b1d..c2b9f7c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,11 +25,19 @@ RUN npm run dist \ && mv build /web-vault ########################## BUILD IMAGE ########################## -# Musl build image for statically compiled binary -FROM clux/muslrust:nightly-2018-08-24 as build +# We need to use the Rust build image, because +# we need the Rust compiler and Cargo tooling +FROM rust as build + +# Using bundled SQLite, no need to install it +# RUN apt-get update && apt-get install -y\ +# sqlite3\ +# --no-install-recommends\ +# && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN USER=root cargo init --bin +RUN USER=root cargo new --bin app +WORKDIR /app # Copies over *only* your manifests and vendored dependencies COPY ./Cargo.* ./ @@ -53,17 +61,17 @@ RUN cargo build --release ######################## RUNTIME IMAGE ######################## # Create a new stage with a minimal image # because we already have a binary built -FROM alpine:3.8 +FROM debian:stretch-slim ENV ROCKET_ENV "staging" ENV ROCKET_WORKERS=10 -ENV SSL_CERT_DIR=/etc/ssl/certs # Install needed libraries -RUN apk add \ - openssl\ - ca-certificates \ - && rm /var/cache/apk/* +RUN apt-get update && apt-get install -y\ + openssl\ + ca-certificates\ + --no-install-recommends\ + && rm -rf /var/lib/apt/lists/* RUN mkdir /data VOLUME /data @@ -74,7 +82,7 @@ EXPOSE 80 COPY .env . COPY Rocket.toml . COPY --from=vault /web-vault ./web-vault -COPY --from=build /volume/target/x86_64-unknown-linux-musl/release/bitwarden_rs . +COPY --from=build app/target/release/bitwarden_rs . # Configures the startup! CMD ./bitwarden_rs diff --git a/Dockerfile.alpine b/Dockerfile.alpine new file mode 100644 index 00000000..3a8b4b1d --- /dev/null +++ b/Dockerfile.alpine @@ -0,0 +1,80 @@ +# Using multistage build: +# https://docs.docker.com/develop/develop-images/multistage-build/ +# https://whitfin.io/speeding-up-rust-docker-builds/ +####################### VAULT BUILD IMAGE ####################### +FROM node:8-alpine as vault + +ENV VAULT_VERSION "v2.2.0" + +ENV URL "https://github.com/bitwarden/web.git" + +RUN apk add --update-cache --upgrade \ + curl \ + git \ + tar + +RUN git clone -b $VAULT_VERSION --depth 1 $URL web-build +WORKDIR /web-build + +COPY /docker/set-vault-baseurl.patch /web-build/ +RUN git apply set-vault-baseurl.patch + +RUN npm run sub:init && npm install + +RUN npm run dist \ + && mv build /web-vault + +########################## BUILD IMAGE ########################## +# Musl build image for statically compiled binary +FROM clux/muslrust:nightly-2018-08-24 as build + +# Creates a dummy project used to grab dependencies +RUN USER=root cargo init --bin + +# Copies over *only* your manifests and vendored dependencies +COPY ./Cargo.* ./ +COPY ./libs ./libs +COPY ./rust-toolchain ./rust-toolchain + +# Builds your dependencies and removes the +# dummy project, except the target folder +# This folder contains the compiled dependencies +RUN cargo build --release +RUN find . -not -path "./target*" -delete + +# Copies the complete project +# To avoid copying unneeded files, use .dockerignore +COPY . . + +# Builds again, this time it'll just be +# your actual source files being built +RUN cargo build --release + +######################## RUNTIME IMAGE ######################## +# Create a new stage with a minimal image +# because we already have a binary built +FROM alpine:3.8 + +ENV ROCKET_ENV "staging" +ENV ROCKET_WORKERS=10 +ENV SSL_CERT_DIR=/etc/ssl/certs + +# Install needed libraries +RUN apk add \ + openssl\ + ca-certificates \ + && rm /var/cache/apk/* + +RUN mkdir /data +VOLUME /data +EXPOSE 80 + +# Copies the files from the context (env file and web-vault) +# and the binary from the "build" stage to the current stage +COPY .env . +COPY Rocket.toml . +COPY --from=vault /web-vault ./web-vault +COPY --from=build /volume/target/x86_64-unknown-linux-musl/release/bitwarden_rs . + +# Configures the startup! +CMD ./bitwarden_rs