From 18703bf195855815d849034f06d786d06e4422eb Mon Sep 17 00:00:00 2001 From: BlackDex Date: Tue, 29 Jun 2021 10:37:39 +0200 Subject: [PATCH] Fix armv7 alpine build. The `messense/rust-musl-cross` has removed OpenSSL in favor of the vendored option. Enabled vendored openssl to resolve this. Resolves #1807 --- docker/Dockerfile.j2 | 3 ++- docker/armv7/Dockerfile.alpine | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index 807ca73c..0ec226dc 100644 --- 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 index cdc8d27f..43f88f01 100644 --- 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