Skip to content

chore(rust): Bump container and tool versions #807

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.

Sign up for GitHub

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 6 commits into from
Aug 21, 2024
Merged

chore(rust): Bump container and tool versions #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
95f65dc
chore(ubi): bump image digest
NickLarsenNZ Aug 16, 2024
62b69fd
chore(rust): bump rust toolchain to 1.80.1
NickLarsenNZ Aug 16, 2024
d144cb1
chore(rust): update instructions for version bumps (until Renovate do…
NickLarsenNZ Aug 16, 2024
6fec543
chore(rust): bump protoc to 27.3
NickLarsenNZ Aug 16, 2024
6365b55
chore(rust): add missing instructions
NickLarsenNZ Aug 16, 2024
6d87721
Merge remote-tracking branch 'origin/main' into stackable-base-bump
NickLarsenNZ Aug 21, 2024
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
17 changes: 12 additions & 5 deletions stackable-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
# syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd

# 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 )
FROM registry.access.redhat.com/ubi9-minimal@sha256:a7d837b00520a32502ada85ae339e33510cdfdbc8d2ddf460cc838e12ec5fa5a AS product-utils-builder
# Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
# IMPORTANT: Be sure to use the Manifest List Digest for multi-arch support
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:104cf11d890aeb7dd5728b7d7732e175a0e4018f1bb00d2faebcc8f6bf29bd52 AS product-utils-builder

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

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

# 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 )
FROM registry.access.redhat.com/ubi9-minimal@sha256:a7d837b00520a32502ada85ae339e33510cdfdbc8d2ddf460cc838e12ec5fa5a AS final
# Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
# IMPORTANT: Be sure to use the Manifest List Digest for multi-arch support
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:104cf11d890aeb7dd5728b7d7732e175a0e4018f1bb00d2faebcc8f6bf29bd52 AS final

# intentionally unused
ARG PRODUCT
Expand Down
15 changes: 11 additions & 4 deletions ubi8-rust-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,23 @@
# Deprecation notice: Stackable has moved to UBI9 as of its 24.7 release
# 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

# 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 )
FROM registry.access.redhat.com/ubi8-minimal@sha256:de2a0a20c1c3b39c3de829196de9694d09f97cd18fda1004de855ed2b4c841ba AS builder
# Find the latest version at https://catalog.redhat.com/software/containers/ubi8-minimal/5c64772edd19c77a158ea216?container-tabs=gti
# IMPORTANT: Be sure to use the Manifest List Digest for multi-arch support
FROM registry.access.redhat.com/ubi8-minimal@sha256:5c6982aca8a8fdbc3ce304bc46e28c6a30572d6791ebd13968da197e75e4f042 AS builder

LABEL maintainer="Stackable GmbH"

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

# Sets the default shell to Bash with strict error handling and robust pipeline processing.
# "-e": Exits immediately if a command exits with a non-zero status
Expand Down
17 changes: 12 additions & 5 deletions ubi9-rust-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
# syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd

# 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 )
FROM registry.access.redhat.com/ubi9-minimal@sha256:a7d837b00520a32502ada85ae339e33510cdfdbc8d2ddf460cc838e12ec5fa5a AS builder
# Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
# IMPORTANT: Be sure to use the Manifest List Digest for multi-arch support
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:104cf11d890aeb7dd5728b7d7732e175a0e4018f1bb00d2faebcc8f6bf29bd52 AS builder

LABEL maintainer="Stackable GmbH"

# This SHOULD to be kept in sync with operator-templating and other tools to reduce build times
ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.80.0
# 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
ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.80.1
# Find the latest version here: https://crates.io/crates/cargo-cyclonedx
# IMPORTANT: Do not update until https://github.com/stackabletech/docker-images/pull/783 is merged
ENV CARGO_CYCLONEDX_CRATE_VERSION=0.4.0
# Find the latest version here: https://crates.io/crates/cargo-auditable
ENV CARGO_AUDITABLE_CRATE_VERSION=0.6.4
ENV PROTOC_VERSION=27.2
# Find the latest version here: https://github.com/protocolbuffers/protobuf/releases
# Upload any newer version to nexus with ./.scripts/upload_new_protoc_version.sh
ENV PROTOC_VERSION=27.3

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