1
0
Fork 0

Merge pull request #933 from jjlin/dockerfiles

Rebuild Dockerfiles to match latest Dockerfile.j2 template
Dieser Commit ist enthalten in:
Daniel García 2020-03-27 17:45:10 +01:00 committet von GitHub
Commit 5471088e93
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
3 geänderte Dateien mit 6 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -19,7 +19,7 @@ FROM bitwardenrs/web-vault@sha256:61db9fab4dfc8259177fbcd25d239b88202c11f039a94c
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# Musl build image for statically compiled binary # Musl build image for statically compiled binary
FROM clux/muslrust:nightly-2019-12-19 as build FROM clux/muslrust:nightly-2020-03-09 as build
# set mysql backend # set mysql backend
ARG DB=mysql ARG DB=mysql
@ -31,6 +31,7 @@ ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
RUN rustup set profile minimal RUN rustup set profile minimal
ENV USER "root" ENV USER "root"
ENV RUSTFLAGS='-C link-arg=-s'
# Install MySQL package # Install MySQL package
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \

Datei anzeigen

@ -19,7 +19,7 @@ FROM bitwardenrs/web-vault@sha256:61db9fab4dfc8259177fbcd25d239b88202c11f039a94c
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# Musl build image for statically compiled binary # Musl build image for statically compiled binary
FROM clux/muslrust:nightly-2019-12-19 as build FROM clux/muslrust:nightly-2020-03-09 as build
# set postgresql backend # set postgresql backend
ARG DB=postgresql ARG DB=postgresql
@ -31,6 +31,7 @@ ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
RUN rustup set profile minimal RUN rustup set profile minimal
ENV USER "root" ENV USER "root"
ENV RUSTFLAGS='-C link-arg=-s'
# Install PostgreSQL package # Install PostgreSQL package
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \

Datei anzeigen

@ -19,7 +19,7 @@ FROM bitwardenrs/web-vault@sha256:61db9fab4dfc8259177fbcd25d239b88202c11f039a94c
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# Musl build image for statically compiled binary # Musl build image for statically compiled binary
FROM clux/muslrust:nightly-2019-12-19 as build FROM clux/muslrust:nightly-2020-03-09 as build
# set sqlite as default for DB ARG for backward compatibility # set sqlite as default for DB ARG for backward compatibility
ARG DB=sqlite ARG DB=sqlite
@ -31,6 +31,7 @@ ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
RUN rustup set profile minimal RUN rustup set profile minimal
ENV USER "root" ENV USER "root"
ENV RUSTFLAGS='-C link-arg=-s'
# Creates a dummy project used to grab dependencies # Creates a dummy project used to grab dependencies
RUN USER=root cargo new --bin /app RUN USER=root cargo new --bin /app