diff options
| author | Mathijs van Veluw <[email protected]> | 2023-12-09 23:04:33 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-09 23:04:33 +0100 |
| commit | 3246251f295fd16dba21ec9d32afbbb104bd9c8e (patch) | |
| tree | b74920222f24255d492a8547d0c5667a6b13d5e3 /docker/Dockerfile.alpine | |
| parent | 8ab200224e9ef0879ccd35080365118b08c43b02 (diff) | |
| download | vaultwarden-3246251f295fd16dba21ec9d32afbbb104bd9c8e.tar.gz vaultwarden-3246251f295fd16dba21ec9d32afbbb104bd9c8e.zip | |
Fix the version string (#4153)
For some reason still not known, the `.git` directory was not copied
into the container. I think buildkit (buildx) did this by default before, and
stopped this with newer versions.
This PR fixes this by also touching `build.rs` besides `src/main.rs`.
This PR also updates Rust to v1.74.1 and some crates, including the
latest version of Alpine 3.19.
Fixes #4150
Diffstat (limited to 'docker/Dockerfile.alpine')
| -rw-r--r-- | docker/Dockerfile.alpine | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index b382b34d..08aca570 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -31,10 +31,10 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:419e4976921f9 ########################## 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.0 as build_amd64 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.74.0 as build_arm64 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.74.0 as build_armv7 -FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.74.0 as build_armv6 +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 ########################## BUILD IMAGE ########################## # hadolint ignore=DL3006 @@ -100,7 +100,8 @@ COPY . . # Builds again, this time it will be the actual source files being build RUN source /env-cargo && \ # Make sure that we actually build the project by updating the src/main.rs timestamp - touch src/main.rs && \ + # Also do this for build.rs to ensure the version is rechecked + touch build.rs src/main.rs && \ # Create a symlink to the binary target folder to easy copy the binary in the final stage cargo build --features ${DB} --profile "${CARGO_PROFILE}" --target="${CARGO_TARGET}" && \ if [[ "${CARGO_PROFILE}" == "dev" ]] ; then \ @@ -126,7 +127,7 @@ RUN source /env-cargo && \ # To uninstall: docker run --privileged --rm tonistiigi/binfmt --uninstall 'qemu-*' # # We need to add `--platform` here, because of a podman bug: https://github.com/containers/buildah/issues/4742 -FROM --platform=$TARGETPLATFORM docker.io/library/alpine:3.18 +FROM --platform=$TARGETPLATFORM docker.io/library/alpine:3.19 ENV ROCKET_PROFILE="release" \ ROCKET_ADDRESS=0.0.0.0 \ |