vw_small

commit 1842a796fb90ce401e9bde8e52974638121ac113
parent 0c96c2d30594332de82032420edac03436174354
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Thu,  8 Oct 2020 16:05:03 +0200

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

Fixed issue with building Alpine armv7 image.
Diffstat:
M
docker/Dockerfile.j2
 | 
2
+-
M
docker/arm32v7/Dockerfile.alpine
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
@@ -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 %}
diff --git a/docker/arm32v7/Dockerfile.alpine b/docker/arm32v7/Dockerfile.alpine
@@ -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