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
dani-garcia · Dec 9, 2023 · 3246251 · 3246251
1 parent 8ab2002
commit 3246251
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 54 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -74,7 +74,7 @@ jobs:
 
  # Only install the clippy and rustfmt components on the default rust-toolchain
  - name: "Install rust-toolchain version"
- uses: dtolnay/rust-toolchain@439cf607258077187679211f12aa6f19af4a0af7 # master @ 2023-09-19 - 05:31 PM GMT+2
+ uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master @ 2023-12-07 - 10:22 PM GMT+1
  if: ${{ matrix.channel == 'rust-toolchain' }}
  with:
  toolchain: "${{steps.toolchain.outputs.RUST_TOOLCHAIN}}"
@@ -84,7 +84,7 @@ jobs:
 
  # Install the any other channel to be used for which we do not execute clippy and rustfmt
  - name: "Install MSRV version"
- uses: dtolnay/rust-toolchain@439cf607258077187679211f12aa6f19af4a0af7 # master @ 2023-09-19 - 05:31 PM GMT+2
+ uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master @ 2023-12-07 - 10:22 PM GMT+1
  if: ${{ matrix.channel != 'rust-toolchain' }}
  with:
  toolchain: "${{steps.toolchain.outputs.RUST_TOOLCHAIN}}"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,7 +48,7 @@ tracing = { version = "0.1.40", features = ["log"] } # Needed to have lettre and
 dotenvy = { version = "0.15.7", default-features = false }
 
 # Lazy initialization
-once_cell = "1.18.0"
+once_cell = "1.19.0"
 
 # Numerical libraries
 num-traits = "0.2.17"
@@ -67,7 +67,7 @@ dashmap = "5.5.3"
 
 # Async futures
 futures = "0.3.29"
-tokio = { version = "1.34.0", features = ["rt-multi-thread", "fs", "io-util", "parking_lot", "time", "signal"] }
+tokio = { version = "1.35.0", features = ["rt-multi-thread", "fs", "io-util", "parking_lot", "time", "signal"] }
 
 # A generic serialization/deserialization framework
 serde = { version = "1.0.193", features = ["derive"] }

diff --git a/build.rs b/build.rs
@@ -17,6 +17,13 @@ fn main() {
  "You need to enable one DB backend. To build with previous defaults do: cargo build --features sqlite"
  );
 
+ // Rerun when these paths are changed.
+ // Someone could have checked-out a tag or specific commit, but no other files changed.
+ println!("cargo:rerun-if-changed=.git");
+ println!("cargo:rerun-if-changed=.git/HEAD");
+ println!("cargo:rerun-if-changed=.git/index");
+ println!("cargo:rerun-if-changed=.git/refs/tags");
+
  #[cfg(all(not(debug_assertions), feature = "query_logger"))]
  compile_error!("Query Logging is only allowed during development, it is not intended for production usage!");
 
@@ -48,11 +55,6 @@ fn run(args: &[&str]) -> Result<String, std::io::Error> {
 /// - env!("GIT_REV")
 /// - env!("VW_VERSION")
 fn version_from_git_info() -> Result<String, std::io::Error> {
- // Rerun when these paths are changed.
- // Someone could have checked-out a tag or specific commit, but no other files changed.
- println!("cargo:rerun-if-changed=.git/HEAD");
- println!("cargo:rerun-if-changed=.git/refs/tags/");
-
  // The exact tag for the current commit, can be empty when
  // the current commit doesn't have an associated tag
  let exact_tag = run(&["git", "describe", "--abbrev=0", "--tags", "--exact-match"]).ok();

diff --git a/docker/DockerSettings.yaml b/docker/DockerSettings.yaml
@@ -4,9 +4,9 @@ vault_image_digest: "sha256:419e4976921f98f1124f296ed02e68bf7f8ff29b3f1fba59e7e7
 # Cross Compile Docker Helper Scripts v1.3.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.74.0 # Rust version to be used
+rust_version: 1.74.1 # Rust version to be used
 debian_version: bookworm # Debian release name to be used
-alpine_version: 3.18 # Alpine version to be used
+alpine_version: 3.19 # Alpine version to be used
 # For which platforms/architectures will we try to build images
 platforms: ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/arm/v6"]
 # Determine the build images per OS/Arch

diff --git 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 \

diff --git 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 \

diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
@@ -91,7 +91,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)" && \
@@ -161,7 +162,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 \

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.74.0"
+channel = "1.74.1"
 components = [ "rustfmt", "clippy" ]
 profile = "minimal"