diff options
| author | Daniel <[email protected]> | 2024-09-07 11:39:29 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-09-07 10:39:29 +0200 |
| commit | 66baa5e7d844a455ffe18a89e9cb8521a013af14 (patch) | |
| tree | b68ac72aee38e3bdd53517da2cb70a1081151d88 /docker | |
| parent | 248e561b3fe6a8172751374df980c6cd43c841d5 (diff) | |
| download | vaultwarden-66baa5e7d844a455ffe18a89e9cb8521a013af14.tar.gz vaultwarden-66baa5e7d844a455ffe18a89e9cb8521a013af14.zip | |
Update Rust version & crates (#4928)
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 313c1999..9d91b4c6 100644 --- a/docker/DockerSettings.yaml +++ b/docker/DockerSettings.yaml @@ -5,7 +5,7 @@ vault_image_digest: "sha256:409ab328ca931439cb916b388a4bb784bd44220717aaf74cf716 # 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:1978e7a58a1777cb0ef0dde76bad60b7914b21da57cfa88047875e4f364297aa" -rust_version: 1.80.1 # Rust version to be used +rust_version: 1.81.0 # Rust version to be used debian_version: bookworm # Debian release name to be used alpine_version: "3.20" # 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 c9c6c4ef..67b14e39 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -32,10 +32,10 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:409ab328ca931 ########################## 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.80.1 AS build_amd64 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.80.1 AS build_arm64 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.80.1 AS build_armv7 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.80.1 AS build_armv6 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.81.0 AS build_amd64 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.81.0 AS build_arm64 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.81.0 AS build_armv7 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.81.0 AS build_armv6 ########################## BUILD IMAGE ########################## # hadolint ignore=DL3006 diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 5fcf6700..f1e52770 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -36,7 +36,7 @@ FROM --platform=linux/amd64 docker.io/tonistiigi/xx@sha256:1978e7a58a1777cb0ef0d ########################## BUILD IMAGE ########################## # hadolint ignore=DL3006 -FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.80.1-slim-bookworm AS build +FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.81.0-slim-bookworm AS build COPY --from=xx / / ARG TARGETARCH ARG TARGETVARIANT |