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.debian | |
| 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.debian')
| -rw-r--r-- | docker/Dockerfile.debian | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 8d5ed360..4d189336 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -35,7 +35,7 @@ FROM --platform=linux/amd64 docker.io/tonistiigi/xx@sha256:c9609ace652bbe51dd4ce ########################## BUILD IMAGE ########################## # hadolint ignore=DL3006 -FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.74.0-slim-bookworm as build +FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.74.1-slim-bookworm as build COPY --from=xx / / ARG TARGETARCH ARG TARGETVARIANT @@ -73,7 +73,8 @@ RUN xx-apt-get install -y \ libmariadb3 \ libpq-dev \ libpq5 \ - libssl-dev && \ + libssl-dev \ + zlib1g-dev && \ # Force install arch dependend mariadb dev packages # Installing them the normal way breaks several other packages (again) apt-get download "libmariadb-dev-compat:$(xx-info debian-arch)" "libmariadb-dev:$(xx-info debian-arch)" && \ @@ -130,7 +131,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 \ |