commit 5471088e930ff96291ecc3f28192bec9fa68eeab
parent 4e85a1dee15548ce7a9e936a76e35ab085d93bc5
Author: Daniel GarcĂa <dani-garcia@users.noreply.github.com>
Date: Fri, 27 Mar 2020 17:45:10 +0100
Merge pull request #933 from jjlin/dockerfiles
Rebuild Dockerfiles to match latest Dockerfile.j2 template
Diffstat:
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine
@@ -19,7 +19,7 @@ FROM bitwardenrs/web-vault@sha256:61db9fab4dfc8259177fbcd25d239b88202c11f039a94c
########################## BUILD IMAGE ##########################
# 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
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
ENV USER "root"
+ENV RUSTFLAGS='-C link-arg=-s'
# Install MySQL package
RUN apt-get update && apt-get install -y \
diff --git a/docker/amd64/postgresql/Dockerfile.alpine b/docker/amd64/postgresql/Dockerfile.alpine
@@ -19,7 +19,7 @@ FROM bitwardenrs/web-vault@sha256:61db9fab4dfc8259177fbcd25d239b88202c11f039a94c
########################## BUILD IMAGE ##########################
# 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
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
ENV USER "root"
+ENV RUSTFLAGS='-C link-arg=-s'
# Install PostgreSQL package
RUN apt-get update && apt-get install -y \
diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine
@@ -19,7 +19,7 @@ FROM bitwardenrs/web-vault@sha256:61db9fab4dfc8259177fbcd25d239b88202c11f039a94c
########################## BUILD IMAGE ##########################
# 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
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
ENV USER "root"
+ENV RUSTFLAGS='-C link-arg=-s'
# Creates a dummy project used to grab dependencies
RUN USER=root cargo new --bin /app