Self-Hosted
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more linting fixes

Browse Source 
Signed-off-by: Felix Bartels <felix@host-consultants.de>
pull/525/head
Felix Bartels 6 years ago
parent 5f688ff209
commit 3fbd7919d8
3 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File

28
docker/amd64/mysql/Dockerfile
Unescape View File

@ -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"]

23
docker/amd64/mysql/Dockerfile.alpine
Unescape View File

@ -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"]

15
docker/amd64/sqlite/Dockerfile.alpine
Unescape View File

@ -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"]

Write Preview
Loading…
Cancel
Save