From cc498a36a25cfb4f46780e8c4e23b71a7c99bd5d Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 3 Apr 2025 17:07:27 +0200 Subject: [PATCH 1/3] chore(ubi8/9): Bump to Rust 1.85.0 --- ubi8-rust-builder/Dockerfile | 2 +- ubi9-rust-builder/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ubi8-rust-builder/Dockerfile b/ubi8-rust-builder/Dockerfile index 0e74506da..0f2b2fd38 100644 --- a/ubi8-rust-builder/Dockerfile +++ b/ubi8-rust-builder/Dockerfile @@ -13,7 +13,7 @@ LABEL maintainer="Stackable GmbH" # 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 -ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.84.1 +ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.85.0 # 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 diff --git a/ubi9-rust-builder/Dockerfile b/ubi9-rust-builder/Dockerfile index 5e545411e..62ef3e605 100644 --- a/ubi9-rust-builder/Dockerfile +++ b/ubi9-rust-builder/Dockerfile @@ -10,7 +10,7 @@ LABEL maintainer="Stackable GmbH" # 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 -ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.84.1 +ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.85.0 # 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 From ffe10c1ed3d3b1aa2526fb6eca042b48325f4b01 Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 3 Apr 2025 17:08:05 +0200 Subject: [PATCH 2/3] chore(ubi8/9): Bump cargo-cyclonedx and cargo-auditable --- ubi8-rust-builder/Dockerfile | 4 ++-- ubi9-rust-builder/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ubi8-rust-builder/Dockerfile b/ubi8-rust-builder/Dockerfile index 0f2b2fd38..4a30f0e97 100644 --- a/ubi8-rust-builder/Dockerfile +++ b/ubi8-rust-builder/Dockerfile @@ -16,10 +16,10 @@ LABEL maintainer="Stackable GmbH" ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.85.0 # 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 # Find the latest version here: https://github.com/protocolbuffers/protobuf/releases # Upload any newer version to nexus with ./.scripts/upload_new_protoc_version.sh # renovate: datasource=github-releases packageName=protocolbuffers/protobuf diff --git a/ubi9-rust-builder/Dockerfile b/ubi9-rust-builder/Dockerfile index 62ef3e605..d61458f90 100644 --- a/ubi9-rust-builder/Dockerfile +++ b/ubi9-rust-builder/Dockerfile @@ -13,10 +13,10 @@ LABEL maintainer="Stackable GmbH" ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.85.0 # 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 # Find the latest version here: https://github.com/protocolbuffers/protobuf/releases # Upload any newer version to nexus with ./.scripts/upload_new_protoc_version.sh # renovate: datasource=github-releases packageName=protocolbuffers/protobuf From 0366c4760253bb37dd116a09c15db410175ed0df Mon Sep 17 00:00:00 2001 From: Techassi Date: Fri, 4 Apr 2025 10:00:26 +0200 Subject: [PATCH 3/3] chore: Add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1904596bc..6a75fa8f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. ### Changed +- ubi-rust-builder: Bump Rust toolchain to 1.85.0, cargo-cyclonedx to 0.5.7, and cargo-auditable to 0.6.6 ([#1050]). - spark-k8s: Include spark-connect jars. Replace OpenJDK with Temurin JDK. Cleanup. ([#1034]) ### Fixed @@ -24,6 +25,7 @@ All notable changes to this project will be documented in this file. [#1034]: https://github.com/stackabletech/docker-images/pull/1034 [#1042]: https://github.com/stackabletech/docker-images/pull/1042 [#1044]: https://github.com/stackabletech/docker-images/pull/1044 +[#1050]: https://github.com/stackabletech/docker-images/pull/1050 ## [25.3.0] - 2025-03-21