trashmodern/vaultwarden
1
0
Fork 1
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-05-22 12:33:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies and web vault

Browse Source
This commit is contained in:
Daniel García
2021-02-24 20:25:22 +01:00
parent 099bba950c
commit 9117095764
10 changed files with 160 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
Cargo.toml
View File

@ -32,7 +32,7 @@ rocket = { version = "0.5.0-dev", features = ["tls"], default-features = false }
rocket_contrib = "0.5.0-dev"
# HTTP client
reqwest = { version = "0.11.0", features = ["blocking", "json"] }
reqwest = { version = "0.11.1", features = ["blocking", "json"] }
# multipart/form-data support
multipart = { version = "0.17.1", features = ["server"], default-features = false }
@ -86,13 +86,13 @@ jsonwebtoken = "7.2.0"
u2f = "0.2.0"
# Yubico Library
yubico = { version = "0.9.2", features = ["online-tokio"], default-features = false }
yubico = { version = "0.10.0", features = ["online-tokio"], default-features = false }
# A `dotenv` implementation for Rust
dotenv = { version = "0.15.0", default-features = false }
# Lazy initialization
once_cell = "1.5.2"
once_cell = "1.7.0"
# Numerical libraries
num-traits = "0.2.14"
@ -100,10 +100,10 @@ num-derive = "0.3.3"
# Email libraries
lettre = { version = "0.10.0-alpha.5", features = ["smtp-transport", "builder", "serde", "native-tls", "hostname", "tracing"], default-features = false }
newline-converter = "0.1.0"
newline-converter = "0.2.0"
# Template library
handlebars = { version = "3.5.2", features = ["dir_source"] }
handlebars = { version = "3.5.3", features = ["dir_source"] }
# For favicon extraction from main website
html5ever = "0.25.1"
@ -117,7 +117,7 @@ openssl = "0.10.32"
# URL encoding library
percent-encoding = "2.1.0"
# Punycode conversion
idna = "0.2.1"
idna = "0.2.2"
# CLI argument parsing
pico-args = "0.4.0"

8
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 Dockerfiles.
{% set build_stage_base_image = "rust:1.48" %}
{% set build_stage_base_image = "rust:1.50" %}
{% if "alpine" in target_file %}
{% if "amd64" in target_file %}
{% set build_stage_base_image = "clux/muslrust:nightly-2021-01-25" %}
{% set build_stage_base_image = "clux/muslrust:nightly-2021-02-22" %}
{% set runtime_stage_base_image = "alpine:3.13" %}
{% set package_arch_target = "x86_64-unknown-linux-musl" %}
{% elif "armv7" 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.18.1d" %}
{% set vault_image_digest = "sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae" %}
{% set vault_version = "2.18.2" %}
{% set vault_image_digest = "sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5" %}
# 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

14
docker/amd64/Dockerfile
View File

@ -14,18 +14,18 @@
# - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
# click the tag name to view the digest of the image it currently points to.
# - From the command line:
# $ docker pull bitwardenrs/web-vault:v2.18.1d
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.1d
# [bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae]
# $ docker pull bitwardenrs/web-vault:v2.18.2
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.2
# [bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5]
#
# - Conversely, to get the tag name from the digest:
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae
# [bitwardenrs/web-vault:v2.18.1d]
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5
# [bitwardenrs/web-vault:v2.18.2]
#
FROM bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae as vault
FROM bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5 as vault
########################## BUILD IMAGE ##########################
FROM rust:1.48 as build
FROM rust:1.50 as build
# Debian-based builds support multidb
ARG DB=sqlite,mysql,postgresql

14
docker/amd64/Dockerfile.alpine
View File

@ -14,18 +14,18 @@
# - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
# click the tag name to view the digest of the image it currently points to.
# - From the command line:
# $ docker pull bitwardenrs/web-vault:v2.18.1d
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.1d
# [bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae]
# $ docker pull bitwardenrs/web-vault:v2.18.2
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.2
# [bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5]
#
# - Conversely, to get the tag name from the digest:
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae
# [bitwardenrs/web-vault:v2.18.1d]
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5
# [bitwardenrs/web-vault:v2.18.2]
#
FROM bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae as vault
FROM bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5 as vault
########################## BUILD IMAGE ##########################
FROM clux/muslrust:nightly-2021-01-25 as build
FROM clux/muslrust:nightly-2021-02-22 as build
# Alpine-based AMD64 (musl) does not support mysql/mariadb during compile time.
ARG DB=sqlite,postgresql

14
docker/arm64/Dockerfile
View File

@ -14,18 +14,18 @@
# - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
# click the tag name to view the digest of the image it currently points to.
# - From the command line:
# $ docker pull bitwardenrs/web-vault:v2.18.1d
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.1d
# [bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae]
# $ docker pull bitwardenrs/web-vault:v2.18.2
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.2
# [bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5]
#
# - Conversely, to get the tag name from the digest:
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae
# [bitwardenrs/web-vault:v2.18.1d]
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5
# [bitwardenrs/web-vault:v2.18.2]
#
FROM bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae as vault
FROM bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5 as vault
########################## BUILD IMAGE ##########################
FROM rust:1.48 as build
FROM rust:1.50 as build
# Debian-based builds support multidb
ARG DB=sqlite,mysql,postgresql

14
docker/armv6/Dockerfile
View File

@ -14,18 +14,18 @@
# - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
# click the tag name to view the digest of the image it currently points to.
# - From the command line:
# $ docker pull bitwardenrs/web-vault:v2.18.1d
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.1d
# [bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae]
# $ docker pull bitwardenrs/web-vault:v2.18.2
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.2
# [bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5]
#
# - Conversely, to get the tag name from the digest:
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae
# [bitwardenrs/web-vault:v2.18.1d]
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5
# [bitwardenrs/web-vault:v2.18.2]
#
FROM bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae as vault
FROM bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5 as vault
########################## BUILD IMAGE ##########################
FROM rust:1.48 as build
FROM rust:1.50 as build
# Debian-based builds support multidb
ARG DB=sqlite,mysql,postgresql

14
docker/armv7/Dockerfile
View File

@ -14,18 +14,18 @@
# - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
# click the tag name to view the digest of the image it currently points to.
# - From the command line:
# $ docker pull bitwardenrs/web-vault:v2.18.1d
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.1d
# [bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae]
# $ docker pull bitwardenrs/web-vault:v2.18.2
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.2
# [bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5]
#
# - Conversely, to get the tag name from the digest:
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae
# [bitwardenrs/web-vault:v2.18.1d]
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5
# [bitwardenrs/web-vault:v2.18.2]
#
FROM bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae as vault
FROM bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5 as vault
########################## BUILD IMAGE ##########################
FROM rust:1.48 as build
FROM rust:1.50 as build
# Debian-based builds support multidb
ARG DB=sqlite,mysql,postgresql

12
docker/armv7/Dockerfile.alpine
View File

@ -14,15 +14,15 @@
# - From https://hub.docker.com/r/bitwardenrs/web-vault/tags,
# click the tag name to view the digest of the image it currently points to.
# - From the command line:
# $ docker pull bitwardenrs/web-vault:v2.18.1d
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.1d
# [bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae]
# $ docker pull bitwardenrs/web-vault:v2.18.2
# $ docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.18.2
# [bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5]
#
# - Conversely, to get the tag name from the digest:
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae
# [bitwardenrs/web-vault:v2.18.1d]
# $ docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5
# [bitwardenrs/web-vault:v2.18.2]
#
FROM bitwardenrs/web-vault@sha256:1134fd81589b0955ff6c87b0228e96b4ccc283679fcd05fc652e99e4861c14ae as vault
FROM bitwardenrs/web-vault@sha256:c287301264c7dc86d89aa80487fd7960cc24048390d2bef9ef910dfc77d2c7d5 as vault
########################## BUILD IMAGE ##########################
FROM messense/rust-musl-cross:armv7-musleabihf as build

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2021-01-25
nightly-2021-02-22