Skip to content

Commit 4c22ec7

Browse files
fix: Install correct Rust toolchains for sub projects (#1013)
* fix: Bump cargo-cyclonedx to 0.5.7 to support v4 Cargo.lock format * chore(stackable-base): Install missing rust toolchains The behaviour of rustup has recently changed: rust-lang/rustup#3985 Co-authored-by: Techassi <[email protected]> * chore(opa): Install missing rust toolchains The behaviour of rustup has recently changed: rust-lang/rustup#3985 Co-authored-by: Techassi <[email protected]> * chore: Update changelog --------- Co-authored-by: Nick Larsen <[email protected]>
1 parent 980bdac commit 4c22ec7

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.
3434

3535
### Changed
3636

37+
- stackable-base: Bump cargo-cyclonedx to 0.5.7 ([#1013]).
3738
- kafka: Bump 3.8.0 to 3.8.1 ([#995]).
3839
- Update registry references to oci ([#989]).
3940
- trino-storage-connector: Move the build out of trino/ for easier patching ([#996]).
@@ -52,6 +53,8 @@ All notable changes to this project will be documented in this file.
5253

5354
### Fixed
5455

56+
- stackable-base: Install missing rust toolchains ([#1013]).
57+
- opa: Install missing rust toolchains ([#1013]).
5558
- druid: Fix CVE-2023-34455 in Druid `30.0.0` by deleting a dependency ([#935]).
5659
- hadoop: Fix the JMX exporter configuration for metrics suffixed with
5760
`_total`, `_info` and `_created` ([#962]).
@@ -84,6 +87,7 @@ All notable changes to this project will be documented in this file.
8487
[#1005]: https://github.com/stackabletech/docker-images/pull/1005
8588
[#1006]: https://github.com/stackabletech/docker-images/pull/1006
8689
[#1007]: https://github.com/stackabletech/docker-images/pull/1007
90+
[#1013]: https://github.com/stackabletech/docker-images/pull/1013
8791

8892
## [24.11.1] - 2025-01-14
8993

opa/Dockerfile

+7-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,15 @@ RUN microdnf update \
2121

2222
WORKDIR /
2323

24+
# WARNING (@NickLarsenNZ): We should pin the rustup version
2425
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
2526
RUN git clone --depth 1 --branch ${BUNDLE_BUILDER_VERSION} https://github.com/stackabletech/opa-bundle-builder
26-
RUN cd ./opa-bundle-builder && . "$HOME/.cargo/env" && cargo --quiet build --release
27+
RUN <<EOF
28+
cd ./opa-bundle-builder
29+
. "$HOME/.cargo/env"
30+
rustup toolchain install
31+
cargo --quiet build --release
32+
EOF
2733

2834
FROM stackable/image/stackable-base AS multilog-builder
2935

stackable-base/Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ ENV CONTAINERDEBUG_VERSION=0.1.1
1818
ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.84.1
1919
# Find the latest version here: https://crates.io/crates/cargo-cyclonedx
2020
# renovate: datasource=crate packageName=cargo-cyclonedx
21-
ENV CARGO_CYCLONEDX_CRATE_VERSION=0.5.5
21+
ENV CARGO_CYCLONEDX_CRATE_VERSION=0.5.7
2222
# Find the latest version here: https://crates.io/crates/cargo-auditable
2323
# renovate: datasource=crate packageName=cargo-auditable
24-
ENV CARGO_AUDITABLE_CRATE_VERSION=0.6.4
24+
ENV CARGO_AUDITABLE_CRATE_VERSION=0.6.6
2525

2626
RUN <<EOF
2727
microdnf update --assumeyes
@@ -34,6 +34,7 @@ microdnf --assumeyes install \
3434
microdnf clean all
3535
rm -rf /var/cache/yum
3636

37+
# WARNING (@NickLarsenNZ): We should pin the rustup version
3738
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_DEFAULT_TOOLCHAIN_VERSION"
3839
. "$HOME/.cargo/env" && cargo --quiet install cargo-cyclonedx@"$CARGO_CYCLONEDX_CRATE_VERSION" cargo-auditable@"$CARGO_AUDITABLE_CRATE_VERSION"
3940
EOF
@@ -44,6 +45,7 @@ RUN <<EOF
4445
git clone --depth 1 --branch "${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/config-utils
4546
cd ./config-utils
4647
. "$HOME/.cargo/env"
48+
rustup toolchain install
4749
cargo auditable --quiet build --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
4850
EOF
4951

@@ -53,6 +55,7 @@ RUN <<EOF
5355
git clone --depth 1 --branch "${CONTAINERDEBUG_VERSION}" https://github.com/stackabletech/containerdebug
5456
cd ./containerdebug
5557
. "$HOME/.cargo/env"
58+
rustup toolchain install
5659
cargo auditable --quiet build --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
5760
EOF
5861

0 commit comments

Comments
 (0)