vividboarder/bitwarden_rs
1
0
Fork 0
mirror of https://github.com/ViViDboarder/bitwarden_rs.git synced 2024-11-05 04:46:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1176 from BlackDex/fix-alpine-arm-docker

Browse Source 
Fixed issue with building Alpine armv7 image.
This commit is contained in:
Daniel García 2020-10-08 16:05:03 +02:00 committed by GitHub
commit 1842a796fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfile.j2
View File

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

2
docker/arm32v7/Dockerfile.alpine
View 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