From 5ab1c8951fc8568729f6011e72ea1d32370b697e Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 5 Jun 2025 13:51:25 +0200 Subject: [PATCH 1/4] chore(issue_template): Reorder druid product bump steps --- .github/ISSUE_TEMPLATE/update-product-druid.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/update-product-druid.md b/.github/ISSUE_TEMPLATE/update-product-druid.md index 04e750553..97e2da501 100644 --- a/.github/ISSUE_TEMPLATE/update-product-druid.md +++ b/.github/ISSUE_TEMPLATE/update-product-druid.md @@ -27,12 +27,13 @@ Add/Change/Remove anything that isn't applicable anymore ## Update tasks +- [ ] Release a new version of [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer) - [ ] Update `versions.py` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions). +- [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions. - [ ] Upload new version (see `druid/upload_new_druid_version.sh`). - [ ] Create a file: `druid/stackable/patches/x.y.z/.gitkeep`, add patches if applicable. - [ ] Delete old patch directories. - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). -- [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions. - [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Ensure prerequisites are up to date (required-external-components.adoc). - [ ] Update the version in demos. Add the PR(s) to the list below. @@ -43,11 +44,11 @@ Add/Change/Remove anything that isn't applicable anymore > Delete any items that do not apply so that all applicable items can be checked. > For example, if you add release notes to the documentation repository, you do not need the latter two criteria. +- [ ] _Link to [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) PR_ - [ ] _Link to the docker-images PR (product update)_ - [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ - [ ] _Link to demo PR (raise against the `main` branch)_ -- [ ] _Link to [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) PR_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ## Acceptance From dd3a74113002a87e094e71fa7a9db6c4b2e731de Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 5 Jun 2025 13:52:11 +0200 Subject: [PATCH 2/4] chore(issue_template): Correct the steps for stackable-base updates --- .github/ISSUE_TEMPLATE/update-base-stackable.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/update-base-stackable.md b/.github/ISSUE_TEMPLATE/update-base-stackable.md index ebb154ba2..e74bcd11b 100644 --- a/.github/ISSUE_TEMPLATE/update-base-stackable.md +++ b/.github/ISSUE_TEMPLATE/update-base-stackable.md @@ -28,9 +28,6 @@ Add/Change/Remove anything that isn't applicable anymore ## Update tasks - [ ] Update UBI version hash in the Dockerfile (`FROM`) -- [ ] Update `RUST_DEFAULT_TOOLCHAIN_VERSION` -- [ ] Update `CARGO_CYCLONEDX_CRATE_VERSION` -- [ ] Update `CARGO_AUDITABLE_CRATE_VERSION` - [ ] Update `PROTOC_VERSION` - [ ] Update `CONFIG_UTILS_VERSION` From fb1e57d39cf280bf540fbfbfa7c12dba807c921d Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 5 Jun 2025 16:17:57 +0200 Subject: [PATCH 3/4] chore(issue_template): Update stackable-base steps to include stackable-devel --- .github/ISSUE_TEMPLATE/update-base-stackable.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/update-base-stackable.md b/.github/ISSUE_TEMPLATE/update-base-stackable.md index e74bcd11b..30327d1b5 100644 --- a/.github/ISSUE_TEMPLATE/update-base-stackable.md +++ b/.github/ISSUE_TEMPLATE/update-base-stackable.md @@ -27,10 +27,18 @@ Add/Change/Remove anything that isn't applicable anymore ## Update tasks -- [ ] Update UBI version hash in the Dockerfile (`FROM`) -- [ ] Update `PROTOC_VERSION` +### `stackable-base` + +- [ ] Update `FROM ...ubi-minimal` version hash in the Dockerfile - [ ] Update `CONFIG_UTILS_VERSION` +### `stackable-devel` + +- [ ] Update `FROM ...ubi-minimal` version hash in the Dockerfile +- [ ] Update `RUST_DEFAULT_TOOLCHAIN_VERSION` +- [ ] Update `CARGO_CYCLONEDX_CRATE_VERSION` +- [ ] Update `CARGO_AUDITABLE_CRATE_VERSION` + ## Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ From e0f6f6dbaa89f6ba8f0cb9086903e2f8dab9b9ed Mon Sep 17 00:00:00 2001 From: dervoeti Date: Wed, 11 Jun 2025 16:17:37 +0200 Subject: [PATCH 4/4] docs: clarify difference between stackable-base and stackable-devel --- stackable-base/Dockerfile | 6 ++++++ stackable-devel/Dockerfile | 3 +++ 2 files changed, 9 insertions(+) diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile index 17214fd05..0e2c16d45 100644 --- a/stackable-base/Dockerfile +++ b/stackable-base/Dockerfile @@ -1,6 +1,12 @@ # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7 # check=error=true +# +# Base image for final stages +# Should not contain any components that are not needed (or helpful) at runtime +# Build time dependencies that are used in multiple images can be added to `stackable-devel` (or a derivative like `java-devel`) instead +# + FROM stackable/image/stackable-devel AS config-utils # Find the latest version here: https://github.com/stackabletech/config-utils/tags diff --git a/stackable-devel/Dockerfile b/stackable-devel/Dockerfile index 9b91674ee..bd52f9d16 100644 --- a/stackable-devel/Dockerfile +++ b/stackable-devel/Dockerfile @@ -3,6 +3,9 @@ # # Base image for builder stages +# It is intended to be used as an intermediate "workbench" layer to build components +# It should not be the base for a final image to avoid shipping build time dependencies like `patchable` or `gcc` +# Use `stackable-base` as a base for the final image stage instead # # Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti