From dd0b84791253acb2178e72c4f386f8f255b4d4c7 Mon Sep 17 00:00:00 2001 From: Miro Prasil Date: Mon, 24 Jun 2019 09:52:55 +0100 Subject: [PATCH 1/3] Move current dockerfiles to their arch folders --- Dockerfile.aarch64 => docker/aarch64/sqlite/Dockerfile | 0 Dockerfile => docker/amd64/sqlite/Dockerfile | 0 Dockerfile.alpine => docker/amd64/sqlite/Dockerfile.alpine | 0 Dockerfile.armv6 => docker/armv6/sqlite/Dockerfile | 0 Dockerfile.armv7 => docker/armv7/sqlite/Dockerfile | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename Dockerfile.aarch64 => docker/aarch64/sqlite/Dockerfile (100%) rename Dockerfile => docker/amd64/sqlite/Dockerfile (100%) rename Dockerfile.alpine => docker/amd64/sqlite/Dockerfile.alpine (100%) rename Dockerfile.armv6 => docker/armv6/sqlite/Dockerfile (100%) rename Dockerfile.armv7 => docker/armv7/sqlite/Dockerfile (100%) diff --git a/Dockerfile.aarch64 b/docker/aarch64/sqlite/Dockerfile similarity index 100% rename from Dockerfile.aarch64 rename to docker/aarch64/sqlite/Dockerfile diff --git a/Dockerfile b/docker/amd64/sqlite/Dockerfile similarity index 100% rename from Dockerfile rename to docker/amd64/sqlite/Dockerfile diff --git a/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine similarity index 100% rename from Dockerfile.alpine rename to docker/amd64/sqlite/Dockerfile.alpine diff --git a/Dockerfile.armv6 b/docker/armv6/sqlite/Dockerfile similarity index 100% rename from Dockerfile.armv6 rename to docker/armv6/sqlite/Dockerfile diff --git a/Dockerfile.armv7 b/docker/armv7/sqlite/Dockerfile similarity index 100% rename from Dockerfile.armv7 rename to docker/armv7/sqlite/Dockerfile From d10ef3fd4b7b9b2554568324cef6e29a6e20dd39 Mon Sep 17 00:00:00 2001 From: Miro Prasil Date: Mon, 24 Jun 2019 09:56:26 +0100 Subject: [PATCH 2/3] Create Dockerfiles for mysql builds --- docker/aarch64/mysql/Dockerfile | 97 +++++++++++++++++++++++++++ docker/amd64/mysql/Dockerfile | 96 +++++++++++++++++++++++++++ docker/amd64/mysql/Dockerfile.alpine | 79 ++++++++++++++++++++++ docker/armv6/mysql/Dockerfile | 97 +++++++++++++++++++++++++++ docker/armv7/mysql/Dockerfile | 98 ++++++++++++++++++++++++++++ 5 files changed, 467 insertions(+) create mode 100644 docker/aarch64/mysql/Dockerfile create mode 100644 docker/amd64/mysql/Dockerfile create mode 100644 docker/amd64/mysql/Dockerfile.alpine create mode 100644 docker/armv6/mysql/Dockerfile create mode 100644 docker/armv7/mysql/Dockerfile diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile new file mode 100644 index 00000000..7e7f3b94 --- /dev/null +++ b/docker/aarch64/mysql/Dockerfile @@ -0,0 +1,97 @@ +# Using multistage build: +# https://docs.docker.com/develop/develop-images/multistage-build/ +# https://whitfin.io/speeding-up-rust-docker-builds/ +####################### VAULT BUILD IMAGE ####################### +FROM alpine as vault + +ENV VAULT_VERSION "v2.10.1" + +ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" + +RUN apk add --update-cache --upgrade \ + curl \ + tar + +RUN mkdir /web-vault +WORKDIR /web-vault + +RUN curl -L $URL | tar xz +RUN ls + +########################## BUILD IMAGE ########################## +# We need to use the Rust build image, because +# we need the Rust compiler and Cargo tooling +FROM rust as build + +# set mysql backend +ARG DB=mysql + +RUN apt-get update \ + && apt-get install -y \ + gcc-aarch64-linux-gnu \ + && mkdir -p ~/.cargo \ + && echo '[target.aarch64-unknown-linux-gnu]' >> ~/.cargo/config \ + && echo 'linker = "aarch64-linux-gnu-gcc"' >> ~/.cargo/config + +ENV CARGO_HOME "/root/.cargo" +ENV USER "root" + +WORKDIR /app + +# Prepare openssl arm64 libs +RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ + /etc/apt/sources.list.d/deb-src.list \ + && dpkg --add-architecture arm64 \ + && apt-get update \ + && apt-get install -y \ + libssl-dev:arm64 \ + libc6-dev:arm64 \ + libmariadb-dev:arm64 + +ENV CC_aarch64_unknown_linux_gnu="/usr/bin/aarch64-linux-gnu-gcc" +ENV CROSS_COMPILE="1" +ENV OPENSSL_INCLUDE_DIR="/usr/include/aarch64-linux-gnu" +ENV OPENSSL_LIB_DIR="/usr/lib/aarch64-linux-gnu" + +# Copies the complete project +# To avoid copying unneeded files, use .dockerignore +COPY . . + +# Build +RUN rustup target add aarch64-unknown-linux-gnu +RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu -v + +######################## RUNTIME IMAGE ######################## +# Create a new stage with a minimal image +# because we already have a binary built +FROM balenalib/aarch64-debian:stretch + +ENV ROCKET_ENV "staging" +ENV ROCKET_PORT=80 +ENV ROCKET_WORKERS=10 + +RUN [ "cross-build-start" ] + +# Install needed libraries +RUN apt-get update && apt-get install -y\ + openssl\ + ca-certificates\ + libmariadbclient-dev\ + --no-install-recommends\ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir /data + +RUN [ "cross-build-end" ] + +VOLUME /data +EXPOSE 80 + +# Copies the files from the context (Rocket.toml file and web-vault) +# and the binary from the "build" stage to the current stage +COPY Rocket.toml . +COPY --from=vault /web-vault ./web-vault +COPY --from=build /app/target/aarch64-unknown-linux-gnu/release/bitwarden_rs . + +# Configures the startup! +CMD ./bitwarden_rs diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile new file mode 100644 index 00000000..06558823 --- /dev/null +++ b/docker/amd64/mysql/Dockerfile @@ -0,0 +1,96 @@ +# Using multistage build: +# https://docs.docker.com/develop/develop-images/multistage-build/ +# https://whitfin.io/speeding-up-rust-docker-builds/ +####################### VAULT BUILD IMAGE ####################### +FROM alpine as vault + +ENV VAULT_VERSION "v2.10.1" + +ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" + +RUN apk add --update-cache --upgrade \ + curl \ + tar + +RUN mkdir /web-vault +WORKDIR /web-vault + +RUN curl -L $URL | tar xz +RUN ls + +########################## BUILD IMAGE ########################## +# We need to use the Rust build image, because +# we need the Rust compiler and Cargo tooling +FROM rust as build + +# set mysql backend +ARG DB=mysql + +# 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/* + +# Install MySQL package +RUN apt-get update && apt-get install -y \ + libmariadb-dev\ + --no-install-recommends\ + && rm -rf /var/lib/apt/lists/* + +# Creates a dummy project used to grab dependencies +RUN USER=root cargo new --bin app +WORKDIR /app + +# Copies over *only* your manifests and build files +COPY ./Cargo.* ./ +COPY ./rust-toolchain ./rust-toolchain +COPY ./build.rs ./build.rs + +# Builds your dependencies and removes the +# dummy project, except the target folder +# This folder contains the compiled dependencies +RUN cargo build --features ${DB} --release +RUN find . -not -path "./target*" -delete + +# Copies the complete project +# To avoid copying unneeded files, use .dockerignore +COPY . . + +# Make sure that we actually build the project +RUN touch src/main.rs + +# Builds again, this time it'll just be +# your actual source files being built +RUN cargo build --features ${DB} --release + +######################## RUNTIME IMAGE ######################## +# Create a new stage with a minimal image +# because we already have a binary built +FROM debian:stretch-slim + +ENV ROCKET_ENV "staging" +ENV ROCKET_PORT=80 +ENV ROCKET_WORKERS=10 + +# Install needed libraries +RUN apt-get update && apt-get install -y\ + openssl\ + ca-certificates\ + libmariadbclient-dev\ + --no-install-recommends\ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir /data +VOLUME /data +EXPOSE 80 +EXPOSE 3012 + +# Copies the files from the context (Rocket.toml file and web-vault) +# and the binary from the "build" stage to the current stage +COPY Rocket.toml . +COPY --from=vault /web-vault ./web-vault +COPY --from=build app/target/release/bitwarden_rs . + +# Configures the startup! +CMD ./bitwarden_rs diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine new file mode 100644 index 00000000..374292c3 --- /dev/null +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -0,0 +1,79 @@ +# Using multistage build: +# https://docs.docker.com/develop/develop-images/multistage-build/ +# https://whitfin.io/speeding-up-rust-docker-builds/ +####################### VAULT BUILD IMAGE ####################### +FROM alpine as vault + +ENV VAULT_VERSION "v2.10.1" + +ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" + +RUN apk add --update-cache --upgrade \ + curl \ + tar + +RUN mkdir /web-vault +WORKDIR /web-vault + +RUN curl -L $URL | tar xz +RUN ls + +########################## BUILD IMAGE ########################## +# Musl build image for statically compiled binary +FROM clux/muslrust:nightly-2018-12-01 as build + +# set mysql backend +ARG DB=mysql + +ENV USER "root" + +# Install needed libraries +RUN apt-get update && apt-get install -y\ + libmysqlclient-dev\ + --no-install-recommends\ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /app + +# Copies the complete project +# To avoid copying unneeded files, use .dockerignore +COPY . . + +RUN rustup target add x86_64-unknown-linux-musl + +# Make sure that we actually build the project +RUN touch src/main.rs + +# Build +RUN cargo build --features ${DB} --release + +######################## RUNTIME IMAGE ######################## +# Create a new stage with a minimal image +# because we already have a binary built +FROM alpine:3.9 + +ENV ROCKET_ENV "staging" +ENV ROCKET_PORT=80 +ENV ROCKET_WORKERS=10 +ENV SSL_CERT_DIR=/etc/ssl/certs + +# Install needed libraries +RUN apk add \ + openssl \ + mariadb-connector-c \ + ca-certificates \ + && rm /var/cache/apk/* + +RUN mkdir /data +VOLUME /data +EXPOSE 80 +EXPOSE 3012 + +# Copies the files from the context (Rocket.toml file and web-vault) +# and the binary from the "build" stage to the current stage +COPY Rocket.toml . +COPY --from=vault /web-vault ./web-vault +COPY --from=build /app/target/x86_64-unknown-linux-musl/release/bitwarden_rs . + +# Configures the startup! +CMD ./bitwarden_rs diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile new file mode 100644 index 00000000..09f81ee4 --- /dev/null +++ b/docker/armv6/mysql/Dockerfile @@ -0,0 +1,97 @@ +# Using multistage build: +# https://docs.docker.com/develop/develop-images/multistage-build/ +# https://whitfin.io/speeding-up-rust-docker-builds/ +####################### VAULT BUILD IMAGE ####################### +FROM alpine as vault + +ENV VAULT_VERSION "v2.10.1" + +ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" + +RUN apk add --update-cache --upgrade \ + curl \ + tar + +RUN mkdir /web-vault +WORKDIR /web-vault + +RUN curl -L $URL | tar xz +RUN ls + +########################## BUILD IMAGE ########################## +# We need to use the Rust build image, because +# we need the Rust compiler and Cargo tooling +FROM rust as build + +# set mysql backend +ARG DB=mysql + +RUN apt-get update \ + && apt-get install -y \ + gcc-arm-linux-gnueabi \ + && mkdir -p ~/.cargo \ + && echo '[target.arm-unknown-linux-gnueabi]' >> ~/.cargo/config \ + && echo 'linker = "arm-linux-gnueabi-gcc"' >> ~/.cargo/config + +ENV CARGO_HOME "/root/.cargo" +ENV USER "root" + +WORKDIR /app + +# Prepare openssl armel libs +RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ + /etc/apt/sources.list.d/deb-src.list \ + && dpkg --add-architecture armel \ + && apt-get update \ + && apt-get install -y \ + libssl-dev:armel \ + libc6-dev:armel \ + libmariadb-dev:armel + +ENV CC_arm_unknown_linux_gnueabi="/usr/bin/arm-linux-gnueabi-gcc" +ENV CROSS_COMPILE="1" +ENV OPENSSL_INCLUDE_DIR="/usr/include/arm-linux-gnueabi" +ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabi" + +# Copies the complete project +# To avoid copying unneeded files, use .dockerignore +COPY . . + +# Build +RUN rustup target add arm-unknown-linux-gnueabi +RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi -v + +######################## RUNTIME IMAGE ######################## +# Create a new stage with a minimal image +# because we already have a binary built +FROM balenalib/rpi-debian:stretch + +ENV ROCKET_ENV "staging" +ENV ROCKET_PORT=80 +ENV ROCKET_WORKERS=10 + +RUN [ "cross-build-start" ] + +# Install needed libraries +RUN apt-get update && apt-get install -y\ + openssl\ + ca-certificates\ + libmariadbclient-dev\ + --no-install-recommends\ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir /data + +RUN [ "cross-build-end" ] + +VOLUME /data +EXPOSE 80 + +# Copies the files from the context (Rocket.toml file and web-vault) +# and the binary from the "build" stage to the current stage +COPY Rocket.toml . +COPY --from=vault /web-vault ./web-vault +COPY --from=build /app/target/arm-unknown-linux-gnueabi/release/bitwarden_rs . + +# Configures the startup! +CMD ./bitwarden_rs \ No newline at end of file diff --git a/docker/armv7/mysql/Dockerfile b/docker/armv7/mysql/Dockerfile new file mode 100644 index 00000000..bd744cdf --- /dev/null +++ b/docker/armv7/mysql/Dockerfile @@ -0,0 +1,98 @@ +# Using multistage build: +# https://docs.docker.com/develop/develop-images/multistage-build/ +# https://whitfin.io/speeding-up-rust-docker-builds/ +####################### VAULT BUILD IMAGE ####################### +FROM alpine as vault + +ENV VAULT_VERSION "v2.10.1" + +ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" + +RUN apk add --update-cache --upgrade \ + curl \ + tar + +RUN mkdir /web-vault +WORKDIR /web-vault + +RUN curl -L $URL | tar xz +RUN ls + +########################## BUILD IMAGE ########################## +# We need to use the Rust build image, because +# we need the Rust compiler and Cargo tooling +FROM rust as build + +# set mysql backend +ARG DB=mysql + +RUN apt-get update \ + && apt-get install -y \ + gcc-arm-linux-gnueabihf \ + && mkdir -p ~/.cargo \ + && echo '[target.armv7-unknown-linux-gnueabihf]' >> ~/.cargo/config \ + && echo 'linker = "arm-linux-gnueabihf-gcc"' >> ~/.cargo/config + +ENV CARGO_HOME "/root/.cargo" +ENV USER "root" + +WORKDIR /app + +# Prepare openssl armhf libs +RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ + /etc/apt/sources.list.d/deb-src.list \ + && dpkg --add-architecture armhf \ + && apt-get update \ + && apt-get install -y \ + libssl-dev:armhf \ + libc6-dev:armhf \ + libmariadb-dev:armhf + + +ENV CC_armv7_unknown_linux_gnueabihf="/usr/bin/arm-linux-gnueabihf-gcc" +ENV CROSS_COMPILE="1" +ENV OPENSSL_INCLUDE_DIR="/usr/include/arm-linux-gnueabihf" +ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabihf" + +# Copies the complete project +# To avoid copying unneeded files, use .dockerignore +COPY . . + +# Build +RUN rustup target add armv7-unknown-linux-gnueabihf +RUN cargo build --features ${DB} --release --target=armv7-unknown-linux-gnueabihf -v + +######################## RUNTIME IMAGE ######################## +# Create a new stage with a minimal image +# because we already have a binary built +FROM balenalib/armv7hf-debian:stretch + +ENV ROCKET_ENV "staging" +ENV ROCKET_PORT=80 +ENV ROCKET_WORKERS=10 + +RUN [ "cross-build-start" ] + +# Install needed libraries +RUN apt-get update && apt-get install -y\ + openssl\ + ca-certificates\ + libmariadbclient-dev\ + --no-install-recommends\ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir /data + +RUN [ "cross-build-end" ] + +VOLUME /data +EXPOSE 80 + +# Copies the files from the context (Rocket.toml file and web-vault) +# and the binary from the "build" stage to the current stage +COPY Rocket.toml . +COPY --from=vault /web-vault ./web-vault +COPY --from=build /app/target/armv7-unknown-linux-gnueabihf/release/bitwarden_rs . + +# Configures the startup! +CMD ./bitwarden_rs \ No newline at end of file From 9671ed4cca50e621cf18066292928ccb4e04594e Mon Sep 17 00:00:00 2001 From: Miro Prasil Date: Mon, 24 Jun 2019 09:59:43 +0100 Subject: [PATCH 3/3] Symlink amd64 Dockerfile to repo root --- Dockerfile | 1 + 1 file changed, 1 insertion(+) create mode 120000 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 120000 index 00000000..bf93eafd --- /dev/null +++ b/Dockerfile @@ -0,0 +1 @@ +docker/amd64/sqlite/Dockerfile \ No newline at end of file