geforkt von mirrored/vaultwarden
Merge pull request #1176 from BlackDex/fix-alpine-arm-docker
Fixed issue with building Alpine armv7 image.
Dieser Commit ist enthalten in:
Commit
1842a796fb
2 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
|
@ -9,7 +9,7 @@
|
|||
{% set package_arch_name = "" %}
|
||||
{% elif "arm32v7" in target_file %}
|
||||
{% 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 = "" %}
|
||||
{% endif %}
|
||||
{% elif "amd64" in target_file %}
|
||||
|
|
|
@ -65,7 +65,7 @@ RUN musl-strip target/armv7-unknown-linux-musleabihf/release/bitwarden_rs
|
|||
######################## RUNTIME IMAGE ########################
|
||||
# Create a new stage with a minimal image
|
||||
# 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_PORT=80
|
||||
|
|
Laden …
In neuem Issue referenzieren