From f82de8d00de627082c9afa257de10394dac932d9 Mon Sep 17 00:00:00 2001 From: Jeremy Lin Date: Sun, 14 Feb 2021 15:18:47 -0800 Subject: [PATCH] Update Alpine base images to 3.13 --- docker/Dockerfile.j2 | 4 ++-- docker/amd64/Dockerfile.alpine | 2 +- docker/armv7/Dockerfile.alpine | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index efe141e1..96c85f7a 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -5,11 +5,11 @@ {% if "alpine" in target_file %} {% if "amd64" in target_file %} {% set build_stage_base_image = "clux/muslrust:nightly-2021-01-25" %} -{% set runtime_stage_base_image = "alpine:3.12" %} +{% set runtime_stage_base_image = "alpine:3.13" %} {% set package_arch_target = "x86_64-unknown-linux-musl" %} {% elif "armv7" in target_file %} {% set build_stage_base_image = "messense/rust-musl-cross:armv7-musleabihf" %} -{% set runtime_stage_base_image = "balenalib/armv7hf-alpine:3.12" %} +{% set runtime_stage_base_image = "balenalib/armv7hf-alpine:3.13" %} {% set package_arch_target = "armv7-unknown-linux-musleabihf" %} {% endif %} {% elif "amd64" in target_file %} diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine index 40aadbf7..8489683a 100644 --- a/docker/amd64/Dockerfile.alpine +++ b/docker/amd64/Dockerfile.alpine @@ -70,7 +70,7 @@ RUN cargo build --features ${DB} --release --target=x86_64-unknown-linux-musl ######################## RUNTIME IMAGE ######################## # Create a new stage with a minimal image # because we already have a binary built -FROM alpine:3.12 +FROM alpine:3.13 ENV ROCKET_ENV "staging" ENV ROCKET_PORT=80 diff --git a/docker/armv7/Dockerfile.alpine b/docker/armv7/Dockerfile.alpine index 571433a9..732edf7f 100644 --- a/docker/armv7/Dockerfile.alpine +++ b/docker/armv7/Dockerfile.alpine @@ -71,7 +71,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 balenalib/armv7hf-alpine:3.12 +FROM balenalib/armv7hf-alpine:3.13 ENV ROCKET_ENV "staging" ENV ROCKET_PORT=80