Browse Source
build: raise msrv (1.83.0) rust toolchain (1.84.0) (#5374)
* build: raise msrv (1.83.0) rust toolchain (1.84.0)
* build: also update docker images
pull/5260/head^2
Helmut K. C. Tessarek
1 week ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with
8 additions and
8 deletions
-
Cargo.toml
-
docker/DockerSettings.yaml
-
docker/Dockerfile.alpine
-
docker/Dockerfile.debian
-
rust-toolchain.toml
|
|
@ -5,7 +5,7 @@ name = "vaultwarden" |
|
|
version = "1.0.0" |
|
|
version = "1.0.0" |
|
|
authors = ["Daniel García <dani-garcia@users.noreply.github.com>"] |
|
|
authors = ["Daniel García <dani-garcia@users.noreply.github.com>"] |
|
|
edition = "2021" |
|
|
edition = "2021" |
|
|
rust-version = "1.82.0" |
|
|
rust-version = "1.83.0" |
|
|
resolver = "2" |
|
|
resolver = "2" |
|
|
|
|
|
|
|
|
repository = "https://github.com/dani-garcia/vaultwarden" |
|
|
repository = "https://github.com/dani-garcia/vaultwarden" |
|
|
|
|
|
@ -5,7 +5,7 @@ vault_image_digest: "sha256:72d636334b4ad6fe9ba1d12e0cda562cd31772cf28772f6b2fe4 |
|
|
# We use the linux/amd64 platform shell scripts since there is no difference between the different platform scripts |
|
|
# 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 |
|
|
# https://github.com/tonistiigi/xx | https://hub.docker.com/r/tonistiigi/xx/tags |
|
|
xx_image_digest: "sha256:9c207bead753dda9430bdd15425c6518fc7a03d866103c516a2c6889188f5894" |
|
|
xx_image_digest: "sha256:9c207bead753dda9430bdd15425c6518fc7a03d866103c516a2c6889188f5894" |
|
|
rust_version: 1.83.0 # Rust version to be used |
|
|
rust_version: 1.84.0 # Rust version to be used |
|
|
debian_version: bookworm # Debian release name to be used |
|
|
debian_version: bookworm # Debian release name to be used |
|
|
alpine_version: "3.21" # Alpine version to be used |
|
|
alpine_version: "3.21" # Alpine version to be used |
|
|
# For which platforms/architectures will we try to build images |
|
|
# For which platforms/architectures will we try to build images |
|
|
|
|
|
@ -32,10 +32,10 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:72d636334b4ad |
|
|
########################## ALPINE BUILD IMAGES ########################## |
|
|
########################## ALPINE BUILD IMAGES ########################## |
|
|
## NOTE: The Alpine Base Images do not support other platforms then linux/amd64 |
|
|
## 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 |
|
|
## 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.83.0 AS build_amd64 |
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.84.0 AS build_amd64 |
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.83.0 AS build_arm64 |
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.84.0 AS build_arm64 |
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.83.0 AS build_armv7 |
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.84.0 AS build_armv7 |
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.83.0 AS build_armv6 |
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.84.0 AS build_armv6 |
|
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
########################## BUILD IMAGE ########################## |
|
|
# hadolint ignore=DL3006 |
|
|
# hadolint ignore=DL3006 |
|
|
|
|
|
@ -36,7 +36,7 @@ FROM --platform=linux/amd64 docker.io/tonistiigi/xx@sha256:9c207bead753dda9430bd |
|
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
########################## BUILD IMAGE ########################## |
|
|
# hadolint ignore=DL3006 |
|
|
# hadolint ignore=DL3006 |
|
|
FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.83.0-slim-bookworm AS build |
|
|
FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.84.0-slim-bookworm AS build |
|
|
COPY --from=xx / / |
|
|
COPY --from=xx / / |
|
|
ARG TARGETARCH |
|
|
ARG TARGETARCH |
|
|
ARG TARGETVARIANT |
|
|
ARG TARGETVARIANT |
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
[toolchain] |
|
|
[toolchain] |
|
|
channel = "1.83.0" |
|
|
channel = "1.84.0" |
|
|
components = [ "rustfmt", "clippy" ] |
|
|
components = [ "rustfmt", "clippy" ] |
|
|
profile = "minimal" |
|
|
profile = "minimal" |
|
|
|
