vw_small

Hardened fork of Vaultwarden (https://github.com/dani-garcia/vaultwarden) with fewer features.
git clone https://git.philomathiclife.com/repos/vw_small
Log | Files | Refs | README

commit d69be7d03a0369faf1f6be6ed2cb908ec6b7a253
parent c836f88ff2a7f94ee7427ae04b91e702a31ab52a
Author: Daniel GarcĂ­a <dani-garcia@users.noreply.github.com>
Date:   Mon, 15 Feb 2021 20:58:13 +0100

Merge pull request #1389 from jjlin/alpine

Update Alpine base images to 3.13
Diffstat:
Mdocker/Dockerfile.j2 | 4++--
Mdocker/amd64/Dockerfile.alpine | 2+-
Mdocker/armv7/Dockerfile.alpine | 2+-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 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 @@ -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 @@ -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