Skip to content

Commit b7c254e

Browse files
authored
Update Rust to 1.82.0 (dani-garcia#5099)
- raise MSRV to 1.80.0 - also update the crates
1 parent a47b484 commit b7c254e

File tree

6 files changed

+56
-56
lines changed

6 files changed

+56
-56
lines changed

Cargo.lock

+45-45
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "vaultwarden"
33
version = "1.0.0"
44
authors = ["Daniel García <[email protected]>"]
55
edition = "2021"
6-
rust-version = "1.79.0"
6+
rust-version = "1.80.0"
77
resolver = "2"
88

99
repository = "https://github.com/dani-garcia/vaultwarden"
@@ -71,7 +71,7 @@ tokio = { version = "1.40.0", features = ["rt-multi-thread", "fs", "io-util", "p
7171

7272
# A generic serialization/deserialization framework
7373
serde = { version = "1.0.210", features = ["derive"] }
74-
serde_json = "1.0.128"
74+
serde_json = "1.0.129"
7575

7676
# A safe, extensible ORM and Query builder
7777
diesel = { version = "2.2.4", features = ["chrono", "r2d2", "numeric"] }
@@ -86,7 +86,7 @@ rand = { version = "0.8.5", features = ["small_rng"] }
8686
ring = "0.17.8"
8787

8888
# UUID generation
89-
uuid = { version = "1.10.0", features = ["v4"] }
89+
uuid = { version = "1.11.0", features = ["v4"] }
9090

9191
# Date and time libraries
9292
chrono = { version = "0.4.38", features = ["clock", "serde"], default-features = false }
@@ -140,7 +140,7 @@ cookie = "0.18.1"
140140
cookie_store = "0.21.0"
141141

142142
# Used by U2F, JWT and PostgreSQL
143-
openssl = "0.10.66"
143+
openssl = "0.10.68"
144144

145145
# CLI argument parsing
146146
pico-args = "0.5.0"

docker/DockerSettings.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ vault_image_digest: "sha256:409ab328ca931439cb916b388a4bb784bd44220717aaf74cf716
55
# We use the linux/amd64 platform shell scripts since there is no difference between the different platform scripts
66
# https://github.com/tonistiigi/xx | https://hub.docker.com/r/tonistiigi/xx/tags
77
xx_image_digest: "sha256:1978e7a58a1777cb0ef0dde76bad60b7914b21da57cfa88047875e4f364297aa"
8-
rust_version: 1.81.0 # Rust version to be used
8+
rust_version: 1.82.0 # Rust version to be used
99
debian_version: bookworm # Debian release name to be used
1010
alpine_version: "3.20" # Alpine version to be used
1111
# For which platforms/architectures will we try to build images

docker/Dockerfile.alpine

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:409ab328ca931
3232
########################## ALPINE BUILD IMAGES ##########################
3333
## NOTE: The Alpine Base Images do not support other platforms then linux/amd64
3434
## And for Alpine we define all build images here, they will only be loaded when actually used
35-
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.81.0 AS build_amd64
36-
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.81.0 AS build_arm64
37-
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.81.0 AS build_armv7
38-
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.81.0 AS build_armv6
35+
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.82.0 AS build_amd64
36+
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.82.0 AS build_arm64
37+
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.82.0 AS build_armv7
38+
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.82.0 AS build_armv6
3939

4040
########################## BUILD IMAGE ##########################
4141
# hadolint ignore=DL3006

docker/Dockerfile.debian

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ FROM --platform=linux/amd64 docker.io/tonistiigi/xx@sha256:1978e7a58a1777cb0ef0d
3636

3737
########################## BUILD IMAGE ##########################
3838
# hadolint ignore=DL3006
39-
FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.81.0-slim-bookworm AS build
39+
FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.82.0-slim-bookworm AS build
4040
COPY --from=xx / /
4141
ARG TARGETARCH
4242
ARG TARGETVARIANT

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "1.81.0"
2+
channel = "1.82.0"
33
components = [ "rustfmt", "clippy" ]
44
profile = "minimal"

0 commit comments

Comments
 (0)