diff --git a/CHANGELOG.md b/CHANGELOG.md index 467c04391..585e15a55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Fixed + +- cherry-pick: Add `--locked` flag to `cargo install` commands for reproducible builds ([#1044]). + +[#1044]: https://github.com/stackabletech/docker-images/pull/1044 + ## [24.7.0] - 2024-07-23 ### Added diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile index daf80ff1b..851936317 100644 --- a/stackable-base/Dockerfile +++ b/stackable-base/Dockerfile @@ -21,7 +21,7 @@ microdnf clean all rm -rf /var/cache/yum curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_DEFAULT_TOOLCHAIN_VERSION" -. "$HOME/.cargo/env" && cargo install cargo-cyclonedx@"$CARGO_CYCLONEDX_CRATE_VERSION" cargo-auditable@"$CARGO_AUDITABLE_CRATE_VERSION" +. "$HOME/.cargo/env" && cargo install --locked cargo-cyclonedx@"$CARGO_CYCLONEDX_CRATE_VERSION" cargo-auditable@"$CARGO_AUDITABLE_CRATE_VERSION" git clone --depth 1 --branch "${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/config-utils cd ./config-utils diff --git a/ubi8-rust-builder/Dockerfile b/ubi8-rust-builder/Dockerfile index df133754b..4a8a74019 100644 --- a/ubi8-rust-builder/Dockerfile +++ b/ubi8-rust-builder/Dockerfile @@ -67,7 +67,7 @@ WORKDIR / # If you change the toolchain version here, make sure to also change the "rust_version" # property in operator-templating/config/rust.yaml RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUST_DEFAULT_TOOLCHAIN_VERSION \ - && . "$HOME/.cargo/env" && cargo install cargo-cyclonedx@$CARGO_CYCLONEDX_CRATE_VERSION cargo-auditable@$CARGO_AUDITABLE_CRATE_VERSION + && . "$HOME/.cargo/env" && cargo install --locked cargo-cyclonedx@$CARGO_CYCLONEDX_CRATE_VERSION cargo-auditable@$CARGO_AUDITABLE_CRATE_VERSION # Build artifacts will be available in /app. RUN mkdir /app diff --git a/ubi9-rust-builder/Dockerfile b/ubi9-rust-builder/Dockerfile index 00773b5a1..bdda5131d 100644 --- a/ubi9-rust-builder/Dockerfile +++ b/ubi9-rust-builder/Dockerfile @@ -66,7 +66,7 @@ WORKDIR / # If you change the toolchain version here, make sure to also change the "rust_version" # property in operator-templating/config/rust.yaml RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUST_DEFAULT_TOOLCHAIN_VERSION \ -&& . "$HOME/.cargo/env" && cargo install cargo-cyclonedx@$CARGO_CYCLONEDX_CRATE_VERSION cargo-auditable@$CARGO_AUDITABLE_CRATE_VERSION +&& . "$HOME/.cargo/env" && cargo install --locked cargo-cyclonedx@$CARGO_CYCLONEDX_CRATE_VERSION cargo-auditable@$CARGO_AUDITABLE_CRATE_VERSION # Build artifacts will be available in /app. RUN mkdir /app