last round of linting fixes

Signed-off-by: Felix Bartels <felix@host-consultants.de>
6 years ago · 0b13a8c4aa
10 changed files with 101 additions and 78 deletions
--- 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"]
--- 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"]
--- 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
--- 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
--- 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
--- 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

--- 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
+CMD ["./bitwarden_rs"]
--- 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
+CMD ["./bitwarden_rs"]
--- 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
+CMD ["./bitwarden_rs"]
--- 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
+CMD ["./bitwarden_rs"]