Skip to content

Commit 6f11269

Browse files
committed
fix: Add --locked flag to cargo install commands (#1044)
* fix: Add flag to cargo install commands * add changelog entry
1 parent aa10bea commit 6f11269

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
### Fixed
8+
9+
- cherry-pick: Add `--locked` flag to `cargo install` commands for reproducible builds ([#1044]).
10+
11+
[#1044]: https://github.com/stackabletech/docker-images/pull/1044
12+
713
## [24.7.0] - 2024-07-23
814

915
### Added

stackable-base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ microdnf clean all
2121
rm -rf /var/cache/yum
2222

2323
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_DEFAULT_TOOLCHAIN_VERSION"
24-
. "$HOME/.cargo/env" && cargo install cargo-cyclonedx@"$CARGO_CYCLONEDX_CRATE_VERSION" cargo-auditable@"$CARGO_AUDITABLE_CRATE_VERSION"
24+
. "$HOME/.cargo/env" && cargo install --locked cargo-cyclonedx@"$CARGO_CYCLONEDX_CRATE_VERSION" cargo-auditable@"$CARGO_AUDITABLE_CRATE_VERSION"
2525

2626
git clone --depth 1 --branch "${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/config-utils
2727
cd ./config-utils

ubi8-rust-builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ WORKDIR /
6767
# If you change the toolchain version here, make sure to also change the "rust_version"
6868
# property in operator-templating/config/rust.yaml
6969
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUST_DEFAULT_TOOLCHAIN_VERSION \
70-
&& . "$HOME/.cargo/env" && cargo install cargo-cyclonedx@$CARGO_CYCLONEDX_CRATE_VERSION cargo-auditable@$CARGO_AUDITABLE_CRATE_VERSION
70+
&& . "$HOME/.cargo/env" && cargo install --locked cargo-cyclonedx@$CARGO_CYCLONEDX_CRATE_VERSION cargo-auditable@$CARGO_AUDITABLE_CRATE_VERSION
7171

7272
# Build artifacts will be available in /app.
7373
RUN mkdir /app

ubi9-rust-builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ WORKDIR /
6666
# If you change the toolchain version here, make sure to also change the "rust_version"
6767
# property in operator-templating/config/rust.yaml
6868
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUST_DEFAULT_TOOLCHAIN_VERSION \
69-
&& . "$HOME/.cargo/env" && cargo install cargo-cyclonedx@$CARGO_CYCLONEDX_CRATE_VERSION cargo-auditable@$CARGO_AUDITABLE_CRATE_VERSION
69+
&& . "$HOME/.cargo/env" && cargo install --locked cargo-cyclonedx@$CARGO_CYCLONEDX_CRATE_VERSION cargo-auditable@$CARGO_AUDITABLE_CRATE_VERSION
7070

7171
# Build artifacts will be available in /app.
7272
RUN mkdir /app

0 commit comments

Comments
 (0)