Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump rust version to mitigate CVE-2022-21658 #2255

Merged
merged 1 commit into from
Jan 23, 2022
Merged

Bump rust version to mitigate CVE-2022-21658 #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "vaultwarden"
version = "1.0.0"
authors = ["Daniel García <[email protected]>"]
edition = "2021"
rust-version = "1.57"
rust-version = "1.60"
resolver = "2"

repository = "https://github.com/dani-garcia/vaultwarden"
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should also change the nightly version here.
This prevents downloading the the rust toolchain during building, since it is already installed.
It should be done for all build_stage_base_image parameters.

Expand Down
2 changes: 1 addition & 1 deletion docker/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion docker/amd64/Dockerfile.buildx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion docker/arm64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion docker/arm64/Dockerfile.buildx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion docker/armv6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion docker/armv6/Dockerfile.buildx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion docker/armv7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion docker/armv7/Dockerfile.buildx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2021-12-25
nightly-2022-01-23