Merge branch 'main' into feat/airflow-3

Author: adwk67

CHANGELOG.md

@@ -78,6 +78,7 @@ All notable changes to this project will be documented in this file.
 - trino: reduce docker image size by removing the recursive chown/chmods in the final image ([#1025]).
 - zookeeper: reduce docker image size by removing the recursive chown/chmods in the final image ([#1043]).
 - Fixed two hardcoded username references ([#1052]).
+- ubi9-rust-builder: Use pinned `rustup` version ([#1121]).
 
 ### Removed
 
@@ -133,6 +134,7 @@ All notable changes to this project will be documented in this file.
 [#1114]: https://github.com/stackabletech/docker-images/pull/1114
 [#1116]: https://github.com/stackabletech/docker-images/pull/1116
 [#1119]: https://github.com/stackabletech/docker-images/pull/1119
+[#1121]: https://github.com/stackabletech/docker-images/pull/1121
 
 ## [25.3.0] - 2025-03-21
 

ubi9-rust-builder/Dockerfile

@@ -7,6 +7,11 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:e1c4703364c5cb58f5462575
 
 LABEL maintainer="Stackable GmbH"
 
+# Pin the rustup version to avoid unexpected breaking changes.
+# See https://github.com/rust-lang/rustup/blob/4514d36fcc9c42416176111cd841c86f7ec44b2c/rustup-init.sh#L91
+# Find the latest version here: https://github.com/rust-lang/rustup/blob/master/CHANGELOG.md
+# renovate: datasource=github-tags packageName=rust-lang/rustup
+ENV RUSTUP_VERSION=1.28.1
 # This SHOULD be kept in sync with operator-templating and other tools to reduce build times
 # Find the latest version here: https://doc.rust-lang.org/stable/releases.html
 # renovate: datasource=github-releases packageName=rust-lang/rust
@@ -77,7 +82,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 <<EOF
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_DEFAULT_TOOLCHAIN_VERSION"
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | RUSTUP_VERSION="$RUSTUP_VERSION" sh -s -- -y --default-toolchain "$RUST_DEFAULT_TOOLCHAIN_VERSION"
 . "$HOME/.cargo/env"
 cargo install --quiet --locked "cargo-cyclonedx@$CARGO_CYCLONEDX_CRATE_VERSION" "cargo-auditable@$CARGO_AUDITABLE_CRATE_VERSION"
 EOF