commit 5f688ff209d3fdc0ca89ac4972c225b855f75aaa
parent f6cfb5bf2182e7a779bcd22eae778858278cee4b
Author: Felix Bartels <felix@host-consultants.de>
Date: Fri, 5 Jul 2019 22:45:29 +0200
no more linting errors for the main Dockerfile
Signed-off-by: Felix Bartels <felix@host-consultants.de>
Diffstat:
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git 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"]