saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-09 11:12:42 +00:00
Code Activity

Updated web vault, dependencies and base docker images

Browse source
This commit is contained in:
Daniel García 2020-10-03 20:14:17 +02:00
commit ab4355cfed
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
9 changed files with 120 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

10
docker/Dockerfile.j2
View file

@ -1,10 +1,10 @@
# This file was generated using a Jinja2 template.
# Please make your changes in `Dockerfile.j2` and then `make` the individual Dockerfile's.
{% set build_stage_base_image = "rust:1.45" %}
{% set build_stage_base_image = "rust:1.46" %}
{% if "alpine" in target_file %}
{% if "amd64" in target_file %}
{% set build_stage_base_image = "clux/muslrust:nightly-2020-07-09" %}
{% set build_stage_base_image = "clux/muslrust:nightly-2020-10-02" %}
{% set runtime_stage_base_image = "alpine:3.12" %}
{% set package_arch_name = "" %}
{% elif "arm32v7" in target_file %}
@ -33,17 +33,17 @@
# https://docs.docker.com/develop/develop-images/multistage-build/
# https://whitfin.io/speeding-up-rust-docker-builds/
####################### VAULT BUILD IMAGE #######################
{% set vault_image_hash = "sha256:a6705a4d7776500a6544afd141de1786e6b87c386b068be996294960779cb5bf" %}
{% set vault_image_hash = "sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303" %}
{% raw %}
# This hash is extracted from the docker web-vault builds and it's prefered over a simple tag because it's immutable.
# It can be viewed in multiple ways:
# - From the https://hub.docker.com/repository/docker/bitwardenrs/web-vault/tags page, click the tag name and the digest should be there.
# - From the console, with the following commands:
# docker pull bitwardenrs/web-vault:v2.16.0b
# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.0b
# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.1
#
# - To do the opposite, and get the tag from the hash, you can do:
# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:a6705a4d7776500a6544afd141de1786e6b87c386b068be996294960779cb5bf
# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303
{% endraw %}
FROM bitwardenrs/web-vault@{{ vault_image_hash }} as vault