Daniel
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with
7 additions and
7 deletions
-
docker/DockerSettings.yaml
-
docker/Dockerfile.alpine
-
docker/Dockerfile.debian
-
rust-toolchain.toml
|
|
@ -4,7 +4,7 @@ vault_image_digest: "sha256:25a8b48792a3d2c16ddaea493eee93a0b6785648f2d8782c7537 |
|
|
# Cross Compile Docker Helper Scripts v1.4.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 |
|
|
# We use the linux/amd64 platform shell scripts since there is no difference between the different platform scripts |
|
|
xx_image_digest: "sha256:0cd3f05c72d6c9b038eb135f91376ee1169ef3a330d34e418e65e2a5c2e9c0d4" |
|
|
xx_image_digest: "sha256:0cd3f05c72d6c9b038eb135f91376ee1169ef3a330d34e418e65e2a5c2e9c0d4" |
|
|
rust_version: 1.80.0 # Rust version to be used |
|
|
rust_version: 1.80.1 # 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.20" # Alpine version to be used |
|
|
alpine_version: "3.20" # 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:25a8b48792a3d |
|
|
########################## 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.80.0 AS build_amd64 |
|
|
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.0 AS build_arm64 |
|
|
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.0 AS build_armv7 |
|
|
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.0 AS build_armv6 |
|
|
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.80.1 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:0cd3f05c72d6c9b038eb1 |
|
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
########################## BUILD IMAGE ########################## |
|
|
# hadolint ignore=DL3006 |
|
|
# hadolint ignore=DL3006 |
|
|
FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.80.0-slim-bookworm AS build |
|
|
FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.80.1-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.80.0" |
|
|
channel = "1.80.1" |
|
|
components = [ "rustfmt", "clippy" ] |
|
|
components = [ "rustfmt", "clippy" ] |
|
|
profile = "minimal" |
|
|
profile = "minimal" |
|
|
|
