vw_small

commit 1b99da91fbe47d124741f6c00948558cc6664ab5
parent 19e78e3509eead2a7e7954c81156d692dba03c20
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Mon, 24 Jan 2022 00:03:52 +0100

Merge branch 'dscottboggs-fix/CVE-2022-21658' into main

Diffstat:
M
Cargo.toml
 | 
2
+-
M
docker/Dockerfile.j2
 | 
2
+-
M
docker/amd64/Dockerfile
 | 
2
+-
M
docker/amd64/Dockerfile.buildx
 | 
2
+-
M
docker/arm64/Dockerfile
 | 
2
+-
M
docker/arm64/Dockerfile.buildx
 | 
2
+-
M
docker/armv6/Dockerfile
 | 
2
+-
M
docker/armv6/Dockerfile.buildx
 | 
2
+-
M
docker/armv7/Dockerfile
 | 
2
+-
M
docker/armv7/Dockerfile.buildx
 | 
2
+-
M
rust-toolchain
 | 
2
+-

11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "vaultwarden"
 version = "1.0.0"
 authors = ["Daniel García <dani-garcia@users.noreply.github.com>"]
 edition = "2021"
-rust-version = "1.57"
+rust-version = "1.60"
 resolver = "2"
 
 repository = "https://github.com/dani-garcia/vaultwarden"
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
@@ -3,7 +3,7 @@
 # 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.57-buster" %}
+{% set build_stage_base_image = "rust:1.60-buster" %}
 {% if "alpine" in target_file %}
 {%   if "amd64" in target_file %}
 {%     set build_stage_base_image = "blackdex/rust-musl:x86_64-musl-nightly-2021-12-25" %}
diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile
@@ -27,7 +27,7 @@
 FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.57-buster as build
+FROM rust:1.58-buster as build
 
 
 
diff --git a/docker/amd64/Dockerfile.buildx b/docker/amd64/Dockerfile.buildx
@@ -27,7 +27,7 @@
 FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.57-buster as build
+FROM rust:1.58-buster as build
 
 
 
diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile
@@ -27,7 +27,7 @@
 FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.57-buster as build
+FROM rust:1.58-buster as build
 
 
 
diff --git a/docker/arm64/Dockerfile.buildx b/docker/arm64/Dockerfile.buildx
@@ -27,7 +27,7 @@
 FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.57-buster as build
+FROM rust:1.58-buster as build
 
 
 
diff --git a/docker/armv6/Dockerfile b/docker/armv6/Dockerfile
@@ -27,7 +27,7 @@
 FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.57-buster as build
+FROM rust:1.58-buster as build
 
 
 
diff --git a/docker/armv6/Dockerfile.buildx b/docker/armv6/Dockerfile.buildx
@@ -27,7 +27,7 @@
 FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.57-buster as build
+FROM rust:1.58-buster as build
 
 
 
diff --git a/docker/armv7/Dockerfile b/docker/armv7/Dockerfile
@@ -27,7 +27,7 @@
 FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.57-buster as build
+FROM rust:1.58-buster as build
 
 
 
diff --git a/docker/armv7/Dockerfile.buildx b/docker/armv7/Dockerfile.buildx
@@ -27,7 +27,7 @@
 FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.57-buster as build
+FROM rust:1.58-buster as build
 
 
 
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2021-12-25
+nightly-2022-01-23