From 85c0aa1619fe0a926b5d7afff2d2592ae6c263c1 Mon Sep 17 00:00:00 2001 From: "D. Scott Boggs" Date: Sun, 23 Jan 2022 07:50:58 -0500 Subject: [PATCH] Bump rust version to mitigate CVE-2022-21658 --- Cargo.toml | 2 +- docker/Dockerfile.j2 | 2 +- docker/amd64/Dockerfile | 2 +- docker/amd64/Dockerfile.buildx | 2 +- docker/arm64/Dockerfile | 2 +- docker/arm64/Dockerfile.buildx | 2 +- docker/armv6/Dockerfile | 2 +- docker/armv6/Dockerfile.buildx | 2 +- docker/armv7/Dockerfile | 2 +- docker/armv7/Dockerfile.buildx | 2 +- rust-toolchain | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f6ff7f68..7b9ef3a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "vaultwarden" version = "1.0.0" authors = ["Daniel García "] 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 index 792d660f..0c1cacf1 100644 --- 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 index c6bf80b7..73bb88ac 100644 --- 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 index b7193704..2669db34 100644 --- 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 index 7873e21e..bdf4de03 100644 --- 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 index aa6009d1..3d944329 100644 --- 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 index 1509bc5d..05791086 100644 --- 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 index 343a4c54..816a82ee 100644 --- 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 index b3deeade..21bbd741 100644 --- 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 index 79b10b29..35e5a0b5 100644 --- 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 index 979286d9..4c62882b 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2021-12-25 +nightly-2022-01-23