diff options
| author | Mathijs van Veluw <[email protected]> | 2024-04-27 00:53:42 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-04-27 00:53:42 +0200 |
| commit | 2ad33ec97f415edb2af054f527efed52b3b93a9e (patch) | |
| tree | e12a2a9439fa20664e1703ff4a0b67f7ed201e94 /docker | |
| parent | e1a8df96dbadfbf5ad36ce9aa2f31f34396166c2 (diff) | |
| download | vaultwarden-2ad33ec97f415edb2af054f527efed52b3b93a9e.tar.gz vaultwarden-2ad33ec97f415edb2af054f527efed52b3b93a9e.zip | |
Update Crate and Rust (#4522)
* Update Crate and Rust
- Updated all crates
- Updated Rust to the latest patch version
* Updated GitHub Actions
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/DockerSettings.yaml | 6 | ||||
| -rw-r--r-- | docker/Dockerfile.alpine | 8 | ||||
| -rw-r--r-- | docker/Dockerfile.debian | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/docker/DockerSettings.yaml b/docker/DockerSettings.yaml index 1034816d..f4eab726 100644 --- a/docker/DockerSettings.yaml +++ b/docker/DockerSettings.yaml @@ -1,10 +1,10 @@ --- vault_version: "v2024.3.1" vault_image_digest: "sha256:689b1e706f29e1858a5c7e0ec82e40fac793322e5e0ac9102ab09c2620207cd5" -# Cross Compile Docker Helper Scripts v1.3.0 +# Cross Compile Docker Helper Scripts v1.4.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.77.0 # Rust version to be used +xx_image_digest: "sha256:0cd3f05c72d6c9b038eb135f91376ee1169ef3a330d34e418e65e2a5c2e9c0d4" +rust_version: 1.77.2 # 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 b173a2fd..c8d2cc02 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -31,10 +31,10 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:689b1e706f29e ########################## 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.77.0 as build_amd64 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.77.0 as build_arm64 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.77.0 as build_armv7 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.77.0 as build_armv6 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.77.2 as build_amd64 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.77.2 as build_arm64 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.77.2 as build_armv7 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.77.2 as build_armv6 ########################## BUILD IMAGE ########################## # hadolint ignore=DL3006 diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 42e475b5..9e55c07d 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -31,11 +31,11 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:689b1e706f29e ########################## Cross Compile Docker Helper Scripts ########################## ## We use the linux/amd64 no matter which Build Platform, since these are all bash scripts ## And these bash scripts do not have any significant difference if at all -FROM --platform=linux/amd64 docker.io/tonistiigi/xx@sha256:c9609ace652bbe51dd4ce90e0af9d48a4590f1214246da5bc70e46f6dd586edc AS xx +FROM --platform=linux/amd64 docker.io/tonistiigi/xx@sha256:0cd3f05c72d6c9b038eb135f91376ee1169ef3a330d34e418e65e2a5c2e9c0d4 AS xx ########################## BUILD IMAGE ########################## # hadolint ignore=DL3006 -FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.77.0-slim-bookworm as build +FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.77.2-slim-bookworm as build COPY --from=xx / / ARG TARGETARCH ARG TARGETVARIANT |