aboutsummaryrefslogtreecommitdiff
path: root/docker/Dockerfile.j2
diff options
context:
space:
mode:
authorDaniel García <[email protected]>2021-06-26 14:08:06 +0200
committerDaniel García <[email protected]>2021-06-26 14:08:06 +0200
commit8bf1278b1b7483c93cc083fdd6011fc4206447af (patch)
tree4cbd1cd10e38f2ddd23f15963c5c01fcca28a61e /docker/Dockerfile.j2
parent00ce943ea5016cc49ba71b45f36c870d8f55b14e (diff)
downloadvaultwarden-8bf1278b1b7483c93cc083fdd6011fc4206447af.tar.gz
vaultwarden-8bf1278b1b7483c93cc083fdd6011fc4206447af.zip
Update web vault and docker base images
Diffstat (limited to 'docker/Dockerfile.j2')
-rw-r--r--docker/Dockerfile.j212
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
index bca0e0a9..807ca73c 100644
--- a/docker/Dockerfile.j2
+++ b/docker/Dockerfile.j2
@@ -1,15 +1,15 @@
# This file was generated using a Jinja2 template.
# Please make your changes in `Dockerfile.j2` and then `make` the individual Dockerfiles.
-{% set build_stage_base_image = "rust:1.51" %}
+{% set build_stage_base_image = "rust:1.53" %}
{% if "alpine" in target_file %}
{% if "amd64" in target_file %}
-{% set build_stage_base_image = "clux/muslrust:nightly-2021-04-14" %}
-{% set runtime_stage_base_image = "alpine:3.13" %}
+{% set build_stage_base_image = "clux/muslrust:nightly-2021-06-24" %}
+{% set runtime_stage_base_image = "alpine:3.14" %}
{% 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.13" %}
+{% set runtime_stage_base_image = "balenalib/armv7hf-alpine:3.14" %}
{% set package_arch_target = "armv7-unknown-linux-musleabihf" %}
{% endif %}
{% elif "amd64" in target_file %}
@@ -44,8 +44,8 @@
# https://docs.docker.com/develop/develop-images/multistage-build/
# https://whitfin.io/speeding-up-rust-docker-builds/
####################### VAULT BUILD IMAGE #######################
-{% set vault_version = "2.20.4" %}
-{% set vault_image_digest = "sha256:810919341388a50d3a88225ce234333f72eb80382953997e9fd5590cca829e1b" %}
+{% set vault_version = "2.20.4b" %}
+{% set vault_image_digest = "sha256:894e266d4491494dd5a8a736855a6772aa146fa14206853b11b41cf3f3f64d05" %}
# The web-vault digest specifies a particular web-vault build on Docker Hub.
# Using the digest instead of the tag name provides better security,
# as the digest of an image is immutable, whereas a tag name can later