Skip to content

Commit ea3155c

Browse files
authored
chore(rust): Bump container and tool versions (#807)
* chore(ubi): bump image digest * chore(rust): bump rust toolchain to 1.80.1 * chore(rust): update instructions for version bumps (until Renovate does this automatically) * chore(rust): bump protoc to 27.3 * chore(rust): add missing instructions
1 parent 9ab6516 commit ea3155c

File tree

3 files changed

+35
-14
lines changed

3 files changed

+35
-14
lines changed

stackable-base/Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
# syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
22

3-
# Manifest list digest because of multi architecture builds ( https://www.redhat.com/architect/pull-container-image#:~:text=A%20manifest%20list%20exists%20to,system%20on%20a%20specific%20architecture )
4-
FROM registry.access.redhat.com/ubi9-minimal@sha256:a7d837b00520a32502ada85ae339e33510cdfdbc8d2ddf460cc838e12ec5fa5a AS product-utils-builder
3+
# Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
4+
# IMPORTANT: Be sure to use the Manifest List Digest for multi-arch support
5+
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:104cf11d890aeb7dd5728b7d7732e175a0e4018f1bb00d2faebcc8f6bf29bd52 AS product-utils-builder
56

7+
# Find the latest version here: https://github.com/stackabletech/config-utils/tags
68
ENV CONFIG_UTILS_VERSION=0.2.0
79
# This SHOULD be kept in sync with operator-templating and other tools to reduce build times
8-
ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.79.0
10+
# Find the latest version here: https://doc.rust-lang.org/stable/releases.html
11+
ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.80.1
12+
# Find the latest version here: https://crates.io/crates/cargo-cyclonedx
13+
# IMPORTANT: Do not update until https://github.com/stackabletech/docker-images/pull/783 is merged
914
ENV CARGO_CYCLONEDX_CRATE_VERSION=0.4.0
15+
# Find the latest version here: https://crates.io/crates/cargo-auditable
1016
ENV CARGO_AUDITABLE_CRATE_VERSION=0.6.4
1117

1218
RUN <<EOF
@@ -29,8 +35,9 @@ cd ./config-utils
2935
cargo auditable --quiet build --release && cargo cyclonedx --output-pattern package --all --output-cdx
3036
EOF
3137

32-
# Manifest list digest because of multi architecture builds ( https://www.redhat.com/architect/pull-container-image#:~:text=A%20manifest%20list%20exists%20to,system%20on%20a%20specific%20architecture )
33-
FROM registry.access.redhat.com/ubi9-minimal@sha256:a7d837b00520a32502ada85ae339e33510cdfdbc8d2ddf460cc838e12ec5fa5a AS final
38+
# Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
39+
# IMPORTANT: Be sure to use the Manifest List Digest for multi-arch support
40+
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:104cf11d890aeb7dd5728b7d7732e175a0e4018f1bb00d2faebcc8f6bf29bd52 AS final
3441

3542
# intentionally unused
3643
ARG PRODUCT

ubi8-rust-builder/Dockerfile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,23 @@
33
# Deprecation notice: Stackable has moved to UBI9 as of its 24.7 release
44
# This builder is kept around and updated until the last SDP release is EOL that uses UBI8 (which is 24.3) so we'll remove this sometime in the summer of 2025
55

6-
# Manifest list digest because of multi architecture builds ( https://www.redhat.com/architect/pull-container-image#:~:text=A%20manifest%20list%20exists%20to,system%20on%20a%20specific%20architecture )
7-
FROM registry.access.redhat.com/ubi8-minimal@sha256:de2a0a20c1c3b39c3de829196de9694d09f97cd18fda1004de855ed2b4c841ba AS builder
6+
# Find the latest version at https://catalog.redhat.com/software/containers/ubi8-minimal/5c64772edd19c77a158ea216?container-tabs=gti
7+
# IMPORTANT: Be sure to use the Manifest List Digest for multi-arch support
8+
FROM registry.access.redhat.com/ubi8-minimal@sha256:5c6982aca8a8fdbc3ce304bc46e28c6a30572d6791ebd13968da197e75e4f042 AS builder
89

910
LABEL maintainer="Stackable GmbH"
1011

1112
# This SHOULD be kept in sync with operator-templating and other tools to reduce build times
12-
ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.80.0
13+
# Find the latest version here: https://doc.rust-lang.org/stable/releases.html
14+
ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.80.1
15+
# Find the latest version here: https://crates.io/crates/cargo-cyclonedx
16+
# IMPORTANT: Do not update until https://github.com/stackabletech/docker-images/pull/783 is merged
1317
ENV CARGO_CYCLONEDX_CRATE_VERSION=0.4.0
18+
# Find the latest version here: https://crates.io/crates/cargo-auditable
1419
ENV CARGO_AUDITABLE_CRATE_VERSION=0.6.4
15-
ENV PROTOC_VERSION=27.2
20+
# Find the latest version here: https://github.com/protocolbuffers/protobuf/releases
21+
# Upload any newer version to nexus with ./.scripts/upload_new_protoc_version.sh
22+
ENV PROTOC_VERSION=27.3
1623

1724
# Sets the default shell to Bash with strict error handling and robust pipeline processing.
1825
# "-e": Exits immediately if a command exits with a non-zero status

ubi9-rust-builder/Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
# syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
22

3-
# Manifest list digest because of multi architecture builds ( https://www.redhat.com/architect/pull-container-image#:~:text=A%20manifest%20list%20exists%20to,system%20on%20a%20specific%20architecture )
4-
FROM registry.access.redhat.com/ubi9-minimal@sha256:a7d837b00520a32502ada85ae339e33510cdfdbc8d2ddf460cc838e12ec5fa5a AS builder
3+
# Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
4+
# IMPORTANT: Be sure to use the Manifest List Digest for multi-arch support
5+
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:104cf11d890aeb7dd5728b7d7732e175a0e4018f1bb00d2faebcc8f6bf29bd52 AS builder
56

67
LABEL maintainer="Stackable GmbH"
78

8-
# This SHOULD to be kept in sync with operator-templating and other tools to reduce build times
9-
ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.80.0
9+
# This SHOULD be kept in sync with operator-templating and other tools to reduce build times
10+
# Find the latest version here: https://doc.rust-lang.org/stable/releases.html
11+
ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.80.1
12+
# Find the latest version here: https://crates.io/crates/cargo-cyclonedx
13+
# IMPORTANT: Do not update until https://github.com/stackabletech/docker-images/pull/783 is merged
1014
ENV CARGO_CYCLONEDX_CRATE_VERSION=0.4.0
15+
# Find the latest version here: https://crates.io/crates/cargo-auditable
1116
ENV CARGO_AUDITABLE_CRATE_VERSION=0.6.4
12-
ENV PROTOC_VERSION=27.2
17+
# Find the latest version here: https://github.com/protocolbuffers/protobuf/releases
18+
# Upload any newer version to nexus with ./.scripts/upload_new_protoc_version.sh
19+
ENV PROTOC_VERSION=27.3
1320

1421
# Sets the default shell to Bash with strict error handling and robust pipeline processing.
1522
# "-e": Exits immediately if a command exits with a non-zero status

0 commit comments

Comments
 (0)