vw_small

commit 832f838ddd1637b72edf3fbfe1eff11a20063388
parent 72e1946ce5c3e6c33024be499b6e0e516a35ce92
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Tue, 29 Jun 2021 17:16:57 +0200

Merge pull request #1809 from BlackDex/fix-armv7

Fix armv7 alpine build.
Diffstat:
M
docker/Dockerfile.j2
 | 
3
++-
M
docker/armv7/Dockerfile.alpine
 | 
3
++-

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
@@ -75,7 +75,8 @@ ARG DB=sqlite,postgresql
 {%     set features = "sqlite,postgresql" %}
 {%   else %}
 # Alpine-based ARM (musl) only supports sqlite during compile time.
-ARG DB=sqlite
+# We now also need to add vendored_openssl, because the current base image we use to build has OpenSSL removed.
+ARG DB=sqlite,vendored_openssl
 {%     set features = "sqlite" %}
 {%   endif %}
 {% else %}
diff --git a/docker/armv7/Dockerfile.alpine b/docker/armv7/Dockerfile.alpine
@@ -28,7 +28,8 @@ FROM vaultwarden/web-vault@sha256:894e266d4491494dd5a8a736855a6772aa146fa1420685
 FROM messense/rust-musl-cross:armv7-musleabihf as build
 
 # Alpine-based ARM (musl) only supports sqlite during compile time.
-ARG DB=sqlite
+# We now also need to add vendored_openssl, because the current base image we use to build has OpenSSL removed.
+ARG DB=sqlite,vendored_openssl
 
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color