mirror of
https://github.com/dani-garcia/vaultwarden
synced 2024-12-14 09:33:44 +01:00
Fixed issue with building Alpine armv7 image.
The runtime image was using a very old Alpine version. This caused issues with the catatonit install Now using the Balena armv7hf Alpine image for this.
This commit is contained in:
parent
0c96c2d305
commit
ce99e5c583
2 changed files with 2 additions and 2 deletions
|
@ -9,7 +9,7 @@
|
||||||
{% set package_arch_name = "" %}
|
{% set package_arch_name = "" %}
|
||||||
{% elif "arm32v7" in target_file %}
|
{% elif "arm32v7" in target_file %}
|
||||||
{% set build_stage_base_image = "messense/rust-musl-cross:armv7-musleabihf" %}
|
{% set build_stage_base_image = "messense/rust-musl-cross:armv7-musleabihf" %}
|
||||||
{% set runtime_stage_base_image = "cmosh/alpine-arm:3.6" %}
|
{% set runtime_stage_base_image = "balenalib/armv7hf-alpine:3.12" %}
|
||||||
{% set package_arch_name = "" %}
|
{% set package_arch_name = "" %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% elif "amd64" in target_file %}
|
{% elif "amd64" in target_file %}
|
||||||
|
|
|
@ -65,7 +65,7 @@ RUN musl-strip target/armv7-unknown-linux-musleabihf/release/bitwarden_rs
|
||||||
######################## RUNTIME IMAGE ########################
|
######################## RUNTIME IMAGE ########################
|
||||||
# Create a new stage with a minimal image
|
# Create a new stage with a minimal image
|
||||||
# because we already have a binary built
|
# because we already have a binary built
|
||||||
FROM cmosh/alpine-arm:3.6
|
FROM balenalib/armv7hf-alpine:3.12
|
||||||
|
|
||||||
ENV ROCKET_ENV "staging"
|
ENV ROCKET_ENV "staging"
|
||||||
ENV ROCKET_PORT=80
|
ENV ROCKET_PORT=80
|
||||||
|
|
Loading…
Reference in a new issue