From ce99e5c5834bae49f90eab6e861de6695eec2333 Mon Sep 17 00:00:00 2001 From: BlackDex Date: Thu, 8 Oct 2020 13:12:58 +0200 Subject: [PATCH] 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. --- docker/Dockerfile.j2 | 2 +- docker/arm32v7/Dockerfile.alpine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index e281290..d9bb8a7 100644 --- 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 index f18bad3..3dccfa7 100644 --- 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