mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2025-05-07 03:22:58 +03:00
Update u2f to 0.2, which requires OpenSSL but also might solve the problems we've had with certificates.
The rust image doesn't need installing curl or tar, so removed. Also collapsed ENV lines.
This commit is contained in:
parent
c0ba3406ef
commit
84ed185579
16 changed files with 109 additions and 241 deletions
docker/amd64/postgresql
|
@ -12,16 +12,7 @@ ENV VAULT_VERSION "v2.12.0b"
|
|||
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
|
||||
|
||||
# Build time options to avoid dpkg warnings and help with reproducible builds.
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
ARG LANG=C.UTF-8
|
||||
ARG TZ=UTC
|
||||
ARG TERM=xterm-256color
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y \
|
||||
--no-install-recommends \
|
||||
curl \
|
||||
tar
|
||||
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
|
||||
|
||||
RUN mkdir /web-vault
|
||||
WORKDIR /web-vault
|
||||
|
@ -40,10 +31,7 @@ FROM rust:1.40 as build
|
|||
ARG DB=postgresql
|
||||
|
||||
# Build time options to avoid dpkg warnings and help with reproducible builds.
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
ARG LANG=C.UTF-8
|
||||
ARG TZ=UTC
|
||||
ARG TERM=xterm-256color
|
||||
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
|
||||
|
||||
# Don't download rust docs
|
||||
RUN rustup set profile minimal
|
||||
|
|
|
@ -11,9 +11,7 @@ ENV VAULT_VERSION "v2.12.0b"
|
|||
|
||||
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
|
||||
|
||||
RUN apk add --no-cache --upgrade \
|
||||
curl \
|
||||
tar
|
||||
RUN apk add --no-cache --upgrade curl tar
|
||||
|
||||
RUN mkdir /web-vault
|
||||
WORKDIR /web-vault
|
||||
|
@ -31,10 +29,7 @@ FROM clux/muslrust:nightly-2019-12-19 as build
|
|||
ARG DB=postgresql
|
||||
|
||||
# Build time options to avoid dpkg warnings and help with reproducible builds.
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
ARG LANG=C.UTF-8
|
||||
ARG TZ=UTC
|
||||
ARG TERM=xterm-256color
|
||||
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
|
||||
|
||||
# Don't download rust docs
|
||||
RUN rustup set profile minimal
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue