From d4bfa1a1893b473e60a3238abcdc10bf4eb3599b Mon Sep 17 00:00:00 2001 From: Jeremy Lin Date: Thu, 26 Mar 2020 20:10:33 -0700 Subject: [PATCH] Rebuild Dockerfiles to match latest Dockerfile.j2 template Picks up a couple of missed changes from b837348b and ccf6ee79. --- docker/amd64/mysql/Dockerfile.alpine | 3 ++- docker/amd64/postgresql/Dockerfile.alpine | 3 ++- docker/amd64/sqlite/Dockerfile.alpine | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine index 92dca50f..d8f4556d 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -19,7 +19,7 @@ FROM bitwardenrs/web-vault@sha256:feb3f46d15738191b9043be4cdb1be2c0078ed411e7b7b ########################## 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 index 676462d0..d3bd8c79 100644 --- a/docker/amd64/postgresql/Dockerfile.alpine +++ b/docker/amd64/postgresql/Dockerfile.alpine @@ -19,7 +19,7 @@ FROM bitwardenrs/web-vault@sha256:feb3f46d15738191b9043be4cdb1be2c0078ed411e7b7b ########################## 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 index cd0e8f8c..ad753937 100644 --- a/docker/amd64/sqlite/Dockerfile.alpine +++ b/docker/amd64/sqlite/Dockerfile.alpine @@ -19,7 +19,7 @@ FROM bitwardenrs/web-vault@sha256:feb3f46d15738191b9043be4cdb1be2c0078ed411e7b7b ########################## 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