Skip to content

fix: Install correct Rust toolchains for sub projects #1013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.

### Changed

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

### Fixed

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

## [24.11.1] - 2025-01-14

Expand Down
8 changes: 7 additions & 1 deletion opa/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,15 @@ RUN microdnf update \

WORKDIR /

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

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

Expand Down
7 changes: 5 additions & 2 deletions stackable-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ ENV CONTAINERDEBUG_VERSION=0.1.1
ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.84.1
# Find the latest version here: https://crates.io/crates/cargo-cyclonedx
# renovate: datasource=crate packageName=cargo-cyclonedx
ENV CARGO_CYCLONEDX_CRATE_VERSION=0.5.5
ENV CARGO_CYCLONEDX_CRATE_VERSION=0.5.7
# Find the latest version here: https://crates.io/crates/cargo-auditable
# renovate: datasource=crate packageName=cargo-auditable
ENV CARGO_AUDITABLE_CRATE_VERSION=0.6.4
ENV CARGO_AUDITABLE_CRATE_VERSION=0.6.6

RUN <<EOF
microdnf update --assumeyes
Expand All @@ -34,6 +34,7 @@ microdnf --assumeyes install \
microdnf clean all
rm -rf /var/cache/yum

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

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

Expand Down