From b1c0195256aa9c95cd6d78cc0668f86cd81a7151 Mon Sep 17 00:00:00 2001 From: Techassi Date: Fri, 4 Apr 2025 09:34:33 +0200 Subject: [PATCH 1/3] fix: Pin rustup version --- ubi9-rust-builder/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ubi9-rust-builder/Dockerfile b/ubi9-rust-builder/Dockerfile index 033e8808f..914ea5f4c 100644 --- a/ubi9-rust-builder/Dockerfile +++ b/ubi9-rust-builder/Dockerfile @@ -7,6 +7,9 @@ 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 +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 +80,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 < Date: Mon, 19 May 2025 12:40:56 +0200 Subject: [PATCH 2/3] chore: Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46f533983..0a11588c3 100644 --- a/CHANGELOG.md +++ b/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 From ff69e0747e074a4e7e6e9da25aa190f253b2ff92 Mon Sep 17 00:00:00 2001 From: Techassi Date: Mon, 19 May 2025 15:40:25 +0200 Subject: [PATCH 3/3] chore(ubi9-rust-builder): Add renovate annotation --- ubi9-rust-builder/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubi9-rust-builder/Dockerfile b/ubi9-rust-builder/Dockerfile index 914ea5f4c..4a5fa8487 100644 --- a/ubi9-rust-builder/Dockerfile +++ b/ubi9-rust-builder/Dockerfile @@ -9,6 +9,8 @@ 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