diff options
| author | Daniel García <[email protected]> | 2021-10-08 22:29:19 +0200 |
|---|---|---|
| committer | Daniel García <[email protected]> | 2021-10-08 22:29:19 +0200 |
| commit | 44da9e6ca7b42fa6c02bc5e80e9dda83240004e7 (patch) | |
| tree | 5beaa3cd31deade95ad7251c102a1e563a052fca | |
| parent | f67854c59ccedc40ad0d91c367596935b2f802ec (diff) | |
| parent | 4c0c8f74322202447bf89e41c456c0a8197750f1 (diff) | |
| download | vaultwarden-44da9e6ca7b42fa6c02bc5e80e9dda83240004e7.tar.gz vaultwarden-44da9e6ca7b42fa6c02bc5e80e9dda83240004e7.zip | |
Merge branch 'BlackDex-update-openssl-amd64-alpine' into main
| -rw-r--r-- | docker/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/amd64/Dockerfile.alpine | 2 | ||||
| -rw-r--r-- | docker/amd64/Dockerfile.buildx.alpine | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index cb5c612c..666424e2 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -6,7 +6,7 @@ {% set build_stage_base_image = "rust:1.55-buster" %} {% if "alpine" in target_file %} {% if "amd64" in target_file %} -{% set build_stage_base_image = "clux/muslrust:nightly-2021-08-22" %} +{% set build_stage_base_image = "clux/muslrust:nightly-2021-10-06" %} {% set runtime_stage_base_image = "alpine:3.14" %} {% set package_arch_target = "x86_64-unknown-linux-musl" %} {% elif "armv7" in target_file %} @@ -114,6 +114,7 @@ RUN {{ mount_rust_cache -}} mkdir -pv "${CARGO_HOME}" \ {% if "alpine" in target_file %} ENV RUSTFLAGS='-C link-arg=-s' {% if "armv7" in target_file %} +{#- https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html -#} ENV CFLAGS_armv7_unknown_linux_musleabihf="-mfpu=vfpv3-d16" {% endif %} {% elif "arm" in target_file %} diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine index 2d558e1e..37d698cb 100644 --- a/docker/amd64/Dockerfile.alpine +++ b/docker/amd64/Dockerfile.alpine @@ -27,7 +27,7 @@ FROM vaultwarden/web-vault@sha256:68790f9a62bf3edd6d54ce62ba9f0a2d2ddc7d3e1e9e36324fcbe632293f8fbc as vault ########################## BUILD IMAGE ########################## -FROM clux/muslrust:nightly-2021-08-22 as build +FROM clux/muslrust:nightly-2021-10-06 as build # Alpine-based AMD64 (musl) does not support mysql/mariadb during compile time. ARG DB=sqlite,postgresql diff --git a/docker/amd64/Dockerfile.buildx.alpine b/docker/amd64/Dockerfile.buildx.alpine index 1a8793fe..7d476453 100644 --- a/docker/amd64/Dockerfile.buildx.alpine +++ b/docker/amd64/Dockerfile.buildx.alpine @@ -27,7 +27,7 @@ FROM vaultwarden/web-vault@sha256:68790f9a62bf3edd6d54ce62ba9f0a2d2ddc7d3e1e9e36324fcbe632293f8fbc as vault ########################## BUILD IMAGE ########################## -FROM clux/muslrust:nightly-2021-08-22 as build +FROM clux/muslrust:nightly-2021-10-06 as build # Alpine-based AMD64 (musl) does not support mysql/mariadb during compile time. ARG DB=sqlite,postgresql |