From df8c9f39ac8538ff65c25bcf3c50b70b9a75f4c4 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Thu, 4 Jul 2019 15:59:50 +0200 Subject: [PATCH 1/5] add hadolint to travisfile Signed-off-by: Felix Bartels --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1f6f26cb..98f82607 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,20 @@ dist: xenial +env: + global: + - HADOLINT_VERSION=1.17.1 + language: rust rust: nightly cache: cargo +before_install: + - sudo curl -L https://github.com/hadolint/hadolint/releases/download/v$HADOLINT_VERSION/hadolint-$(uname -s)-$(uname -m) -o /usr/local/bin/hadolint + - sudo chmod +rx /usr/local/bin/hadolint + # Nothing to install install: true script: +- git ls-files --exclude='Dockerfile*' --ignored | xargs --max-lines=1 hadolint - cargo build --features "sqlite" - cargo build --features "mysql" From f6cfb5bf2182e7a779bcd22eae778858278cee4b Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Fri, 5 Jul 2019 11:06:44 +0200 Subject: [PATCH 2/5] add hadolint config file to globally ignore certain rules --- .hadolint.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .hadolint.yaml diff --git a/.hadolint.yaml b/.hadolint.yaml new file mode 100644 index 00000000..f1c324b8 --- /dev/null +++ b/.hadolint.yaml @@ -0,0 +1,7 @@ +ignored: + # disable explicit version for apt install + - DL3008 + # disable explicit version for apk install + - DL3018 +trustedRegistries: + - docker.io From 5f688ff209d3fdc0ca89ac4972c225b855f75aaa Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Fri, 5 Jul 2019 22:45:29 +0200 Subject: [PATCH 3/5] no more linting errors for the main Dockerfile Signed-off-by: Felix Bartels --- docker/amd64/sqlite/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile index cfa1e293..f26efa03 100644 --- a/docker/amd64/sqlite/Dockerfile +++ b/docker/amd64/sqlite/Dockerfile @@ -2,26 +2,28 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -FROM alpine as vault +FROM alpine:3.10 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 \ +RUN apk add --no-cache --upgrade \ curl \ tar RUN mkdir /web-vault WORKDIR /web-vault +SHELL ["/bin/ash", "-eo", "pipefail", "-c"] + 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 +FROM rust:1.36 as build # set sqlite as default for DB ARG for backward comaptibility ARG DB=sqlite @@ -93,4 +95,4 @@ COPY --from=vault /web-vault ./web-vault COPY --from=build app/target/release/bitwarden_rs . # Configures the startup! -CMD ./bitwarden_rs +CMD ["./bitwarden_rs"] From 3fbd7919d81604d89be2b59b4e3e93e1da3fc129 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Sat, 6 Jul 2019 08:16:05 +0200 Subject: [PATCH 4/5] more linting fixes Signed-off-by: Felix Bartels --- docker/amd64/mysql/Dockerfile | 28 ++++++++++++++------------- docker/amd64/mysql/Dockerfile.alpine | 23 +++++++++++----------- docker/amd64/sqlite/Dockerfile.alpine | 15 +++++++------- 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile index 06558823..15bb1d9a 100644 --- a/docker/amd64/mysql/Dockerfile +++ b/docker/amd64/mysql/Dockerfile @@ -2,26 +2,28 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -FROM alpine as vault +FROM alpine:3.10 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 \ +RUN apk add --no-cache --upgrade \ curl \ tar RUN mkdir /web-vault WORKDIR /web-vault +SHELL ["/bin/ash", "-eo", "pipefail", "-c"] + 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 +FROM rust:1.36 as build # set mysql backend ARG DB=mysql @@ -34,9 +36,9 @@ ARG DB=mysql # Install MySQL package RUN apt-get update && apt-get install -y \ - libmariadb-dev\ - --no-install-recommends\ - && rm -rf /var/lib/apt/lists/* + 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 @@ -74,12 +76,12 @@ 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 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 @@ -93,4 +95,4 @@ COPY --from=vault /web-vault ./web-vault COPY --from=build app/target/release/bitwarden_rs . # Configures the startup! -CMD ./bitwarden_rs +CMD ["./bitwarden_rs"] \ No newline at end of file diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine index 374292c3..2f064acc 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -2,19 +2,21 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -FROM alpine as vault +FROM alpine:3.10 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 \ +RUN apk add --no-cache --upgrade \ curl \ tar RUN mkdir /web-vault WORKDIR /web-vault +SHELL ["/bin/ash", "-eo", "pipefail", "-c"] + RUN curl -L $URL | tar xz RUN ls @@ -28,10 +30,10 @@ 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/* +RUN apt-get update && apt-get install -y \ + libmysqlclient-dev \ + --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* WORKDIR /app @@ -50,7 +52,7 @@ 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 +FROM alpine:3.10 ENV ROCKET_ENV "staging" ENV ROCKET_PORT=80 @@ -58,11 +60,10 @@ ENV ROCKET_WORKERS=10 ENV SSL_CERT_DIR=/etc/ssl/certs # Install needed libraries -RUN apk add \ +RUN apk add --no-cache \ openssl \ mariadb-connector-c \ - ca-certificates \ - && rm /var/cache/apk/* + ca-certificates RUN mkdir /data VOLUME /data @@ -76,4 +77,4 @@ 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 +CMD ["./bitwarden_rs"] \ No newline at end of file diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine index 8d7eefc1..490b1f6c 100644 --- a/docker/amd64/sqlite/Dockerfile.alpine +++ b/docker/amd64/sqlite/Dockerfile.alpine @@ -2,19 +2,21 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -FROM alpine as vault +FROM alpine:3.10 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 \ +RUN apk add --no-cache --upgrade \ curl \ tar RUN mkdir /web-vault WORKDIR /web-vault +SHELL ["/bin/ash", "-eo", "pipefail", "-c"] + RUN curl -L $URL | tar xz RUN ls @@ -50,7 +52,7 @@ 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 +FROM alpine:3.10 ENV ROCKET_ENV "staging" ENV ROCKET_PORT=80 @@ -58,11 +60,10 @@ ENV ROCKET_WORKERS=10 ENV SSL_CERT_DIR=/etc/ssl/certs # Install needed libraries -RUN apk add \ +RUN apk add --no-cache \ openssl \ mariadb-connector-c \ - ca-certificates \ - && rm /var/cache/apk/* + ca-certificates RUN mkdir /data VOLUME /data @@ -76,4 +77,4 @@ 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 +CMD ["./bitwarden_rs"] From 0b13a8c4aae48400803d3693a78709d68e088718 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Sat, 6 Jul 2019 08:36:18 +0200 Subject: [PATCH 5/5] last round of linting fixes Signed-off-by: Felix Bartels --- docker/aarch64/mysql/Dockerfile | 22 +++++++++++++--------- docker/aarch64/sqlite/Dockerfile | 22 +++++++++++++--------- docker/amd64/mysql/Dockerfile | 6 +++--- docker/amd64/mysql/Dockerfile.alpine | 2 +- docker/amd64/sqlite/Dockerfile | 22 +++++++++++----------- docker/amd64/sqlite/Dockerfile.alpine | 8 ++++---- docker/armv6/mysql/Dockerfile | 24 ++++++++++++++---------- docker/armv6/sqlite/Dockerfile | 24 ++++++++++++++---------- docker/armv7/mysql/Dockerfile | 24 ++++++++++++++---------- docker/armv7/sqlite/Dockerfile | 25 ++++++++++++++----------- 10 files changed, 101 insertions(+), 78 deletions(-) diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile index 7e7f3b94..3c225f39 100644 --- a/docker/aarch64/mysql/Dockerfile +++ b/docker/aarch64/mysql/Dockerfile @@ -2,32 +2,35 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -FROM alpine as vault +FROM alpine:3.10 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 \ +RUN apk add --no-cache --upgrade \ curl \ tar RUN mkdir /web-vault WORKDIR /web-vault +SHELL ["/bin/ash", "-eo", "pipefail", "-c"] + 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 +FROM rust:1.36 as build # set mysql backend ARG DB=mysql RUN apt-get update \ && apt-get install -y \ + --no-install-recommends \ gcc-aarch64-linux-gnu \ && mkdir -p ~/.cargo \ && echo '[target.aarch64-unknown-linux-gnu]' >> ~/.cargo/config \ @@ -44,6 +47,7 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ && dpkg --add-architecture arm64 \ && apt-get update \ && apt-get install -y \ + --no-install-recommends \ libssl-dev:arm64 \ libc6-dev:arm64 \ libmariadb-dev:arm64 @@ -73,11 +77,11 @@ 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\ +RUN apt-get update && apt-get install -y \ + --no-install-recommends \ + openssl \ + ca-certificates \ + libmariadbclient-dev \ && rm -rf /var/lib/apt/lists/* RUN mkdir /data @@ -94,4 +98,4 @@ 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 +CMD ["./bitwarden_rs"] \ No newline at end of file diff --git a/docker/aarch64/sqlite/Dockerfile b/docker/aarch64/sqlite/Dockerfile index c151d9ba..100e382e 100644 --- a/docker/aarch64/sqlite/Dockerfile +++ b/docker/aarch64/sqlite/Dockerfile @@ -2,32 +2,35 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -FROM alpine as vault +FROM alpine:3.10 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 \ +RUN apk add --no-cache --upgrade \ curl \ tar RUN mkdir /web-vault WORKDIR /web-vault +SHELL ["/bin/ash", "-eo", "pipefail", "-c"] + 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 +FROM rust:1.36 as build # set sqlite as default for DB ARG for backward comaptibility ARG DB=sqlite RUN apt-get update \ && apt-get install -y \ + --no-install-recommends \ gcc-aarch64-linux-gnu \ && mkdir -p ~/.cargo \ && echo '[target.aarch64-unknown-linux-gnu]' >> ~/.cargo/config \ @@ -44,6 +47,7 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ && dpkg --add-architecture arm64 \ && apt-get update \ && apt-get install -y \ + --no-install-recommends \ libssl-dev:arm64 \ libc6-dev:arm64 \ libmariadb-dev:arm64 @@ -73,11 +77,11 @@ 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\ +RUN apt-get update && apt-get install -y \ + --no-install-recommends \ + openssl \ + ca-certificates \ + libmariadbclient-dev \ && rm -rf /var/lib/apt/lists/* RUN mkdir /data @@ -94,4 +98,4 @@ 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 +CMD ["./bitwarden_rs"] \ No newline at end of file diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile index 15bb1d9a..84eec5cd 100644 --- a/docker/amd64/mysql/Dockerfile +++ b/docker/amd64/mysql/Dockerfile @@ -30,14 +30,14 @@ ARG DB=mysql # Using bundled SQLite, no need to install it # RUN apt-get update && apt-get install -y\ +# --no-install-recommends \ # 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 \ + libmariadb-dev \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies @@ -77,10 +77,10 @@ ENV ROCKET_WORKERS=10 # Install needed libraries RUN apt-get update && apt-get install -y \ + --no-install-recommends \ openssl \ ca-certificates \ libmariadbclient-dev \ - --no-install-recommends \ && rm -rf /var/lib/apt/lists/* RUN mkdir /data diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine index 2f064acc..ad4878f9 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -31,8 +31,8 @@ ENV USER "root" # Install needed libraries RUN apt-get update && apt-get install -y \ - libmysqlclient-dev \ --no-install-recommends \ + libmysqlclient-dev \ && rm -rf /var/lib/apt/lists/* WORKDIR /app diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile index f26efa03..b1533ff1 100644 --- a/docker/amd64/sqlite/Dockerfile +++ b/docker/amd64/sqlite/Dockerfile @@ -30,15 +30,15 @@ ARG DB=sqlite # Using bundled SQLite, no need to install it # RUN apt-get update && apt-get install -y\ -# sqlite3\ -# --no-install-recommends\ +# --no-install-recommends \ +# sqlite3 \ # && 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/* + --no-install-recommends \ + libmariadb-dev \ + && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies RUN USER=root cargo new --bin app @@ -76,12 +76,12 @@ 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 apt-get update && apt-get install -y \ + --no-install-recommends \ + openssl \ + ca-certificates \ + libmariadbclient-dev \ + && rm -rf /var/lib/apt/lists/* RUN mkdir /data VOLUME /data diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine index 490b1f6c..7d2b3bd9 100644 --- a/docker/amd64/sqlite/Dockerfile.alpine +++ b/docker/amd64/sqlite/Dockerfile.alpine @@ -30,10 +30,10 @@ ARG DB=sqlite 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/* +RUN apt-get update && apt-get install -y \ + --no-install-recommends \ + libmysqlclient-dev \ + && rm -rf /var/lib/apt/lists/* WORKDIR /app diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile index 09f81ee4..ad8de801 100644 --- a/docker/armv6/mysql/Dockerfile +++ b/docker/armv6/mysql/Dockerfile @@ -2,32 +2,35 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -FROM alpine as vault +FROM alpine:3.10 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 \ +RUN apk add --no-cache --upgrade \ curl \ tar RUN mkdir /web-vault WORKDIR /web-vault +SHELL ["/bin/ash", "-eo", "pipefail", "-c"] + 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 +FROM rust:1.36 as build # set mysql backend ARG DB=mysql RUN apt-get update \ && apt-get install -y \ + --no-install-recommends \ gcc-arm-linux-gnueabi \ && mkdir -p ~/.cargo \ && echo '[target.arm-unknown-linux-gnueabi]' >> ~/.cargo/config \ @@ -44,6 +47,7 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ && dpkg --add-architecture armel \ && apt-get update \ && apt-get install -y \ + --no-install-recommends \ libssl-dev:armel \ libc6-dev:armel \ libmariadb-dev:armel @@ -73,12 +77,12 @@ 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 apt-get update && apt-get install -y \ + --no-install-recommends \ + openssl \ + ca-certificates \ + libmariadbclient-dev \ + && rm -rf /var/lib/apt/lists/* RUN mkdir /data @@ -94,4 +98,4 @@ 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 +CMD ["./bitwarden_rs"] diff --git a/docker/armv6/sqlite/Dockerfile b/docker/armv6/sqlite/Dockerfile index 469381e0..6fa2bcb6 100644 --- a/docker/armv6/sqlite/Dockerfile +++ b/docker/armv6/sqlite/Dockerfile @@ -2,32 +2,35 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -FROM alpine as vault +FROM alpine:3.10 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 \ +RUN apk add --no-cache --upgrade \ curl \ tar RUN mkdir /web-vault WORKDIR /web-vault +SHELL ["/bin/ash", "-eo", "pipefail", "-c"] + 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 +FROM rust:1.36 as build # set sqlite as default for DB ARG for backward comaptibility ARG DB=sqlite RUN apt-get update \ && apt-get install -y \ + --no-install-recommends \ gcc-arm-linux-gnueabi \ && mkdir -p ~/.cargo \ && echo '[target.arm-unknown-linux-gnueabi]' >> ~/.cargo/config \ @@ -44,6 +47,7 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ && dpkg --add-architecture armel \ && apt-get update \ && apt-get install -y \ + --no-install-recommends \ libssl-dev:armel \ libc6-dev:armel \ libmariadb-dev:armel @@ -73,12 +77,12 @@ 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 apt-get update && apt-get install -y \ + --no-install-recommends \ + openssl \ + ca-certificates \ + libmariadbclient-dev \ + && rm -rf /var/lib/apt/lists/* RUN mkdir /data @@ -94,4 +98,4 @@ 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 +CMD ["./bitwarden_rs"] diff --git a/docker/armv7/mysql/Dockerfile b/docker/armv7/mysql/Dockerfile index bd744cdf..66f4a6fe 100644 --- a/docker/armv7/mysql/Dockerfile +++ b/docker/armv7/mysql/Dockerfile @@ -2,32 +2,35 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -FROM alpine as vault +FROM alpine:3.10 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 \ +RUN apk add --no-cache --upgrade \ curl \ tar RUN mkdir /web-vault WORKDIR /web-vault +SHELL ["/bin/ash", "-eo", "pipefail", "-c"] + 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 +FROM rust:1.36 as build # set mysql backend ARG DB=mysql RUN apt-get update \ && apt-get install -y \ + --no-install-recommends \ gcc-arm-linux-gnueabihf \ && mkdir -p ~/.cargo \ && echo '[target.armv7-unknown-linux-gnueabihf]' >> ~/.cargo/config \ @@ -44,6 +47,7 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ && dpkg --add-architecture armhf \ && apt-get update \ && apt-get install -y \ + --no-install-recommends \ libssl-dev:armhf \ libc6-dev:armhf \ libmariadb-dev:armhf @@ -74,12 +78,12 @@ 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 apt-get update && apt-get install -y \ + --no-install-recommends \ + openssl \ + ca-certificates \ + libmariadbclient-dev \ + && rm -rf /var/lib/apt/lists/* RUN mkdir /data @@ -95,4 +99,4 @@ 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 +CMD ["./bitwarden_rs"] \ No newline at end of file diff --git a/docker/armv7/sqlite/Dockerfile b/docker/armv7/sqlite/Dockerfile index c93988f7..2d25a9b2 100644 --- a/docker/armv7/sqlite/Dockerfile +++ b/docker/armv7/sqlite/Dockerfile @@ -2,32 +2,35 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -FROM alpine as vault +FROM alpine:3.10 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 \ +RUN apk add --no-cache --upgrade \ curl \ tar RUN mkdir /web-vault WORKDIR /web-vault +SHELL ["/bin/ash", "-eo", "pipefail", "-c"] + 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 +FROM rust:1.36 as build # set sqlite as default for DB ARG for backward comaptibility ARG DB=sqlite RUN apt-get update \ && apt-get install -y \ + --no-install-recommends \ gcc-arm-linux-gnueabihf \ && mkdir -p ~/.cargo \ && echo '[target.armv7-unknown-linux-gnueabihf]' >> ~/.cargo/config \ @@ -44,11 +47,11 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ && dpkg --add-architecture armhf \ && apt-get update \ && apt-get install -y \ + --no-install-recommends \ 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" @@ -74,12 +77,12 @@ 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 apt-get update && apt-get install -y \ + --no-install-recommends \ + openssl \ + ca-certificates \ + libmariadbclient-dev \ + && rm -rf /var/lib/apt/lists/* RUN mkdir /data @@ -95,4 +98,4 @@ 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 +CMD ["./bitwarden_rs"] \ No newline at end of file