From 3fbd7919d81604d89be2b59b4e3e93e1da3fc129 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Sat, 6 Jul 2019 08:16:05 +0200 Subject: [PATCH] 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 0655882..15bb1d9 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 374292c..2f064ac 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 8d7eefc..490b1f6 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"]