Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-25 05:40:29 +01:00
Merge pull request #1809 from BlackDex/fix-armv7
Fix armv7 alpine build.
Dieser Commit ist enthalten in:
Commit
832f838ddd
2 geänderte Dateien mit 4 neuen und 2 gelöschten Zeilen
|
@ -75,7 +75,8 @@ ARG DB=sqlite,postgresql
|
||||||
{% set features = "sqlite,postgresql" %}
|
{% set features = "sqlite,postgresql" %}
|
||||||
{% else %}
|
{% else %}
|
||||||
# Alpine-based ARM (musl) only supports sqlite during compile time.
|
# 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" %}
|
{% set features = "sqlite" %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
|
@ -28,7 +28,8 @@ FROM vaultwarden/web-vault@sha256:894e266d4491494dd5a8a736855a6772aa146fa1420685
|
||||||
FROM messense/rust-musl-cross:armv7-musleabihf as build
|
FROM messense/rust-musl-cross:armv7-musleabihf as build
|
||||||
|
|
||||||
# Alpine-based ARM (musl) only supports sqlite during compile time.
|
# 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.
|
# 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
|
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
|
||||||
|
|
Laden …
In neuem Issue referenzieren