diff options
| author | Mathijs van Veluw <[email protected]> | 2024-01-01 15:41:54 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-01-01 15:41:54 +0100 |
| commit | c5665e7b7767236923a1712fa14ad2d249408379 (patch) | |
| tree | 128356e9842fac4a85ae2631255ffd1abe9f064f /docker | |
| parent | cbdcf8ef9f1ba0f4ad63f14d366ee778979a91ee (diff) | |
| download | vaultwarden-c5665e7b7767236923a1712fa14ad2d249408379.tar.gz vaultwarden-c5665e7b7767236923a1712fa14ad2d249408379.zip | |
Update Rust and Crates (#4211)
- Updated Rust to v1.75.0
- Updated all the crates
- Fixed warning generated by latest version of Rust
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/DockerSettings.yaml | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.alpine | 8 | ||||
| -rw-r--r-- | docker/Dockerfile.debian | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/DockerSettings.yaml b/docker/DockerSettings.yaml index d19a4cb4..87a41784 100644 --- a/docker/DockerSettings.yaml +++ b/docker/DockerSettings.yaml @@ -4,7 +4,7 @@ vault_image_digest: "sha256:cb8e27c241e474d1c162e0fc1909ba0c33f20cf44464d96356e6 # Cross Compile Docker Helper Scripts v1.3.0 # We use the linux/amd64 platform shell scripts since there is no difference between the different platform scripts xx_image_digest: "sha256:c9609ace652bbe51dd4ce90e0af9d48a4590f1214246da5bc70e46f6dd586edc" -rust_version: 1.74.1 # Rust version to be used +rust_version: 1.75.0 # Rust version to be used debian_version: bookworm # Debian release name to be used alpine_version: 3.19 # Alpine version to be used # For which platforms/architectures will we try to build images diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 6763449f..91c741b1 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -31,10 +31,10 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:cb8e27c241e47 ########################## 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.74.1 as build_amd64 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.74.1 as build_arm64 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.74.1 as build_armv7 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.74.1 as build_armv6 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.75.0 as build_amd64 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.75.0 as build_arm64 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.75.0 as build_armv7 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.75.0 as build_armv6 ########################## BUILD IMAGE ########################## # hadolint ignore=DL3006 diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 6c1ba935..662b52cc 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -35,7 +35,7 @@ FROM --platform=linux/amd64 docker.io/tonistiigi/xx@sha256:c9609ace652bbe51dd4ce ########################## BUILD IMAGE ########################## # hadolint ignore=DL3006 -FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.74.1-slim-bookworm as build +FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.75.0-slim-bookworm as build COPY --from=xx / / ARG TARGETARCH ARG TARGETVARIANT |