diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac322b06e2..8da478703b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: # QUAY_REPO needs to be 'quay.io//' # Check for Quay.io credentials in secrets HAVE_QUAY_LOGIN: ${{ vars.QUAY_REPO != '' && secrets.QUAY_USERNAME != '' && secrets.QUAY_TOKEN != '' }} - PLATFORMS: "['linux/amd64', 'linux/arm64']" + PLATFORMS: "['linux/amd64', 'linux/amd64/v3', 'linux/arm64']" strategy: matrix: base_image: ["debian","alpine"] diff --git a/docker/DockerSettings.yaml b/docker/DockerSettings.yaml index 84ca87ba2d..ba1576763c 100644 --- a/docker/DockerSettings.yaml +++ b/docker/DockerSettings.yaml @@ -20,6 +20,7 @@ build_stage_image: platform: "linux/amd64" # The Alpine build images only have linux/amd64 images arch_image: amd64: "ghcr.io/blackdex/rust-musl:x86_64-musl-stable-{{rust_version}}" + amd64v3: "ghcr.io/blackdex/rust-musl:x86_64-musl-stable-{{rust_version}}" arm64: "ghcr.io/blackdex/rust-musl:aarch64-musl-stable-{{rust_version}}" armv7: "ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-{{rust_version}}" armv6: "ghcr.io/blackdex/rust-musl:arm-musleabi-stable-{{rust_version}}" diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index a1f1b955ce..4464f90320 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -33,6 +33,7 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:cb6b2095a4afc ## 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.84.1 AS build_amd64 +FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.84.1 AS build_amd64v3 FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.84.1 AS build_arm64 FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.84.1 AS build_armv7 FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.84.1 AS build_armv6