MyFavMirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-28 08:05:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1809 from BlackDex/fix-armv7

Browse Source 
Fix armv7 alpine build.
This commit is contained in:
Daniel García 2021-06-29 17:16:57 +02:00 committed by GitHub
commit 832f838ddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/Dockerfile.j2
View File

@ -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 %}

3
docker/armv7/Dockerfile.alpine
View File

@ -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