Browse Source
Update to Rust v1.91 and update crates
Signed-off-by: BlackDex <black.dex@gmail.com>
pull/6339/head
BlackDex
1 month ago
No known key found for this signature in database
GPG Key ID: 58C80A2AA6C765E1
9 changed files with
16 additions and
16 deletions
-
.github/workflows/trivy.yml
-
.github/workflows/typos.yml
-
.pre-commit-config.yaml
-
Cargo.lock
-
Cargo.toml
-
docker/DockerSettings.yaml
-
docker/Dockerfile.alpine
-
docker/Dockerfile.debian
-
rust-toolchain.toml
|
|
|
@ -46,6 +46,6 @@ jobs: |
|
|
|
severity: CRITICAL,HIGH |
|
|
|
|
|
|
|
- name: Upload Trivy scan results to GitHub Security tab |
|
|
|
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0 |
|
|
|
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2 |
|
|
|
with: |
|
|
|
sarif_file: 'trivy-results.sarif' |
|
|
|
|
|
|
|
@ -19,4 +19,4 @@ jobs: |
|
|
|
|
|
|
|
# When this version is updated, do not forget to update this in `.pre-commit-config.yaml` too |
|
|
|
- name: Spell Check Repo |
|
|
|
uses: crate-ci/typos@80c8a4945eec0f6d464eaf9e65ed98ef085283d1 # v1.38.1 |
|
|
|
uses: crate-ci/typos@07d900b8fa1097806b8adb6391b0d3e0ac2fdea7 # v1.39.0 |
|
|
|
|
|
|
|
@ -53,6 +53,6 @@ repos: |
|
|
|
- "cd docker && make" |
|
|
|
# When this version is updated, do not forget to update this in `.github/workflows/typos.yaml` too |
|
|
|
- repo: https://github.com/crate-ci/typos |
|
|
|
rev: 80c8a4945eec0f6d464eaf9e65ed98ef085283d1 # v1.38.1 |
|
|
|
rev: 07d900b8fa1097806b8adb6391b0d3e0ac2fdea7 # v1.39.0 |
|
|
|
hooks: |
|
|
|
- id: typos |
|
|
|
|
|
|
|
@ -598,9 +598,9 @@ dependencies = [ |
|
|
|
|
|
|
|
[[package]] |
|
|
|
name = "aws-smithy-runtime-api" |
|
|
|
version = "1.9.1" |
|
|
|
version = "1.9.2" |
|
|
|
source = "registry+https://github.com/rust-lang/crates.io-index" |
|
|
|
checksum = "3683c5b152d2ad753607179ed71988e8cfd52964443b4f74fd8e552d0bbfeb46" |
|
|
|
checksum = "ec7204f9fd94749a7c53b26da1b961b4ac36bf070ef1e0b94bb09f79d4f6c193" |
|
|
|
dependencies = [ |
|
|
|
"aws-smithy-async", |
|
|
|
"aws-smithy-types", |
|
|
|
@ -615,9 +615,9 @@ dependencies = [ |
|
|
|
|
|
|
|
[[package]] |
|
|
|
name = "aws-smithy-types" |
|
|
|
version = "1.3.3" |
|
|
|
version = "1.3.4" |
|
|
|
source = "registry+https://github.com/rust-lang/crates.io-index" |
|
|
|
checksum = "9f5b3a7486f6690ba25952cabf1e7d75e34d69eaff5081904a47bc79074d6457" |
|
|
|
checksum = "25f535879a207fce0db74b679cfc3e91a3159c8144d717d55f5832aea9eef46e" |
|
|
|
dependencies = [ |
|
|
|
"base64-simd", |
|
|
|
"bytes", |
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
[workspace.package] |
|
|
|
edition = "2021" |
|
|
|
rust-version = "1.88.0" |
|
|
|
rust-version = "1.89.0" |
|
|
|
license = "AGPL-3.0-only" |
|
|
|
repository = "https://github.com/dani-garcia/vaultwarden" |
|
|
|
publish = false |
|
|
|
@ -199,7 +199,7 @@ opendal = { version = "0.54.1", features = ["services-fs"], default-features = f |
|
|
|
anyhow = { version = "1.0.100", optional = true } |
|
|
|
aws-config = { version = "1.8.8", features = ["behavior-version-latest", "rt-tokio", "credentials-process", "sso"], default-features = false, optional = true } |
|
|
|
aws-credential-types = { version = "1.2.8", optional = true } |
|
|
|
aws-smithy-runtime-api = { version = "1.9.1", optional = true } |
|
|
|
aws-smithy-runtime-api = { version = "1.9.2", optional = true } |
|
|
|
http = { version = "1.3.1", optional = true } |
|
|
|
reqsign = { version = "0.16.5", optional = true } |
|
|
|
|
|
|
|
|
|
|
|
@ -5,7 +5,7 @@ vault_image_digest: "sha256:15a126ca967cd2efc4c9625fec49f0b972a3f7d7d81d7770bb0a |
|
|
|
# We use the linux/amd64 platform shell scripts since there is no difference between the different platform scripts |
|
|
|
# https://github.com/tonistiigi/xx | https://hub.docker.com/r/tonistiigi/xx/tags |
|
|
|
xx_image_digest: "sha256:9c207bead753dda9430bdd15425c6518fc7a03d866103c516a2c6889188f5894" |
|
|
|
rust_version: 1.90.0 # Rust version to be used |
|
|
|
rust_version: 1.91.0 # Rust version to be used |
|
|
|
debian_version: trixie # Debian release name to be used |
|
|
|
alpine_version: "3.22" # Alpine version to be used |
|
|
|
# For which platforms/architectures will we try to build images |
|
|
|
|
|
|
|
@ -32,10 +32,10 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:15a126ca967cd |
|
|
|
########################## ALPINE BUILD IMAGES ########################## |
|
|
|
## NOTE: The Alpine Base Images do not support other platforms then linux/amd64 |
|
|
|
## And for Alpine we define all build images here, they will only be loaded when actually used |
|
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.90.0 AS build_amd64 |
|
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.90.0 AS build_arm64 |
|
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.90.0 AS build_armv7 |
|
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.90.0 AS build_armv6 |
|
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.91.0 AS build_amd64 |
|
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.91.0 AS build_arm64 |
|
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.91.0 AS build_armv7 |
|
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.91.0 AS build_armv6 |
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
|
# hadolint ignore=DL3006 |
|
|
|
|
|
|
|
@ -36,7 +36,7 @@ FROM --platform=linux/amd64 docker.io/tonistiigi/xx@sha256:9c207bead753dda9430bd |
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
|
# hadolint ignore=DL3006 |
|
|
|
FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.90.0-slim-trixie AS build |
|
|
|
FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.91.0-slim-trixie AS build |
|
|
|
COPY --from=xx / / |
|
|
|
ARG TARGETARCH |
|
|
|
ARG TARGETVARIANT |
|
|
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
[toolchain] |
|
|
|
channel = "1.90.0" |
|
|
|
channel = "1.91.0" |
|
|
|
components = [ "rustfmt", "clippy" ] |
|
|
|
profile = "minimal" |
|
|
|
|