From cf9c376379a4615e0c86569e2534463586e52bd2 Mon Sep 17 00:00:00 2001 From: dervoeti Date: Thu, 15 May 2025 16:57:22 +0200 Subject: [PATCH 1/7] feat: move statsd_exporter, kcat and trino-storage-connector / separate nifi iceberg builder --- airflow/Dockerfile | 8 ++-- airflow/versions.py | 6 +-- conf.py | 14 +++--- kafka-testing-tools/Dockerfile | 10 ++-- kafka-testing-tools/versions.py | 2 +- kafka/Dockerfile | 10 ++-- {kcat => kafka/kcat}/Dockerfile | 0 {kcat => kafka/kcat}/README.md | 0 {kcat => kafka/kcat}/licenses/KCAT_LICENSES | 0 .../kcat}/licenses/STACKABLE_LICENSE | 0 {kcat => kafka/kcat}/versions.py | 0 kafka/versions.py | 8 ++-- nifi/Dockerfile | 47 +------------------ nifi/iceberg-bundle/Dockerfile | 38 +++++++++++++++ nifi/iceberg-bundle/versions.py | 7 +++ nifi/versions.py | 2 +- .../statsd-exporter}/Dockerfile | 0 .../statsd-exporter}/README.md | 0 .../upload_new_statsd_exporter_version.sh | 0 .../statsd-exporter}/versions.py | 0 superset/Dockerfile | 6 +-- superset/versions.py | 6 +-- trino/Dockerfile | 4 +- .../storage-connector}/Dockerfile | 0 .../licenses/SNOWLIFT_TRINO_STORAGE_LICENSE | 0 .../licenses/STACKABLE_LICENSE | 0 .../451/0001-Add-CycloneDX-plugin.patch | 0 .../stackable/patches/451/patchable.toml | 0 .../455/0001-Add-CycloneDX-plugin.patch | 0 .../stackable/patches/455/patchable.toml | 0 .../470/0001-Add-CycloneDX-plugin.patch | 0 .../stackable/patches/470/patchable.toml | 0 .../stackable/patches/patchable.toml | 0 ...oad_new_trino_storage_connector_version.sh | 0 .../storage-connector}/versions.py | 0 trino/versions.py | 6 +-- 36 files changed, 85 insertions(+), 89 deletions(-) rename {kcat => kafka/kcat}/Dockerfile (100%) rename {kcat => kafka/kcat}/README.md (100%) rename {kcat => kafka/kcat}/licenses/KCAT_LICENSES (100%) rename {kcat => kafka/kcat}/licenses/STACKABLE_LICENSE (100%) rename {kcat => kafka/kcat}/versions.py (100%) create mode 100644 nifi/iceberg-bundle/Dockerfile create mode 100644 nifi/iceberg-bundle/versions.py rename {statsd_exporter => shared/statsd-exporter}/Dockerfile (100%) rename {statsd_exporter => shared/statsd-exporter}/README.md (100%) rename {statsd_exporter => shared/statsd-exporter}/upload_new_statsd_exporter_version.sh (100%) rename {statsd_exporter => shared/statsd-exporter}/versions.py (100%) rename {trino-storage-connector => trino/storage-connector}/Dockerfile (100%) rename {trino-storage-connector => trino/storage-connector}/licenses/SNOWLIFT_TRINO_STORAGE_LICENSE (100%) rename {trino-storage-connector => trino/storage-connector}/licenses/STACKABLE_LICENSE (100%) rename {trino-storage-connector => trino/storage-connector}/stackable/patches/451/0001-Add-CycloneDX-plugin.patch (100%) rename {trino-storage-connector => trino/storage-connector}/stackable/patches/451/patchable.toml (100%) rename {trino-storage-connector => trino/storage-connector}/stackable/patches/455/0001-Add-CycloneDX-plugin.patch (100%) rename {trino-storage-connector => trino/storage-connector}/stackable/patches/455/patchable.toml (100%) rename {trino-storage-connector => trino/storage-connector}/stackable/patches/470/0001-Add-CycloneDX-plugin.patch (100%) rename {trino-storage-connector => trino/storage-connector}/stackable/patches/470/patchable.toml (100%) rename {trino-storage-connector => trino/storage-connector}/stackable/patches/patchable.toml (100%) rename {trino-storage-connector => trino/storage-connector}/upload_new_trino_storage_connector_version.sh (100%) rename {trino-storage-connector => trino/storage-connector}/versions.py (100%) diff --git a/airflow/Dockerfile b/airflow/Dockerfile index ed241ff18..a353c9b35 100644 --- a/airflow/Dockerfile +++ b/airflow/Dockerfile @@ -7,8 +7,6 @@ ARG GIT_SYNC # which should contain a image location (e.g. registry.k8s.io/git-sync/git-sync:v3.6.8) FROM oci.stackable.tech/sdp/git-sync/git-sync:${GIT_SYNC} AS gitsync-image -FROM stackable/image/statsd_exporter AS statsd_exporter-builder - FROM python:3.12-bookworm AS opa-auth-manager-builder COPY airflow/opa-auth-manager/ /tmp/opa-auth-manager @@ -25,7 +23,7 @@ EOF FROM stackable/image/vector AS airflow-build-image ARG PRODUCT -ARG STATSD_EXPORTER +ARG SHARED_STATSD_EXPORTER ARG PYTHON ARG TARGETARCH ARG STACKABLE_USER_UID @@ -94,8 +92,8 @@ else end)' /tmp/sbom.json > /stackable/app/airflow-${PRODUCT}.cdx.json EOF -COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter /stackable/statsd_exporter -COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter-${STATSD_EXPORTER}.cdx.json /stackable/statsd_exporter-${STATSD_EXPORTER}.cdx.json +COPY --from=stackable/image/shared/statsd-exporter /statsd_exporter/statsd_exporter /stackable/statsd_exporter +COPY --from=stackable/image/shared/statsd-exporter /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json COPY --from=gitsync-image --chown=${STACKABLE_USER_UID}:0 /git-sync /stackable/git-sync RUN < Date: Sun, 18 May 2025 15:51:18 +0200 Subject: [PATCH 2/7] feat: separate Dockerfiles for Phoenix, hbase-operator-tools and hbase-opa-authorizer --- conf.py | 6 + hbase/Dockerfile | 192 ++----------------------- hbase/hbase-opa-authorizer/Dockerfile | 35 +++++ hbase/hbase-opa-authorizer/versions.py | 7 + hbase/hbase-operator-tools/Dockerfile | 64 +++++++++ hbase/hbase-operator-tools/versions.py | 16 +++ hbase/phoenix/Dockerfile | 57 ++++++++ hbase/phoenix/versions.py | 10 ++ hbase/versions.py | 22 ++- 9 files changed, 215 insertions(+), 194 deletions(-) create mode 100644 hbase/hbase-opa-authorizer/Dockerfile create mode 100644 hbase/hbase-opa-authorizer/versions.py create mode 100644 hbase/hbase-operator-tools/Dockerfile create mode 100644 hbase/hbase-operator-tools/versions.py create mode 100644 hbase/phoenix/Dockerfile create mode 100644 hbase/phoenix/versions.py diff --git a/conf.py b/conf.py index ffe5d5323..e3067478f 100644 --- a/conf.py +++ b/conf.py @@ -14,6 +14,9 @@ druid = importlib.import_module("druid.versions") hadoop = importlib.import_module("hadoop.versions") hbase = importlib.import_module("hbase.versions") +hbase_phoenix = importlib.import_module("hbase.phoenix.versions") +hbase_opa_authorizer = importlib.import_module("hbase.hbase-opa-authorizer.versions") +hbase_operator_tools = importlib.import_module("hbase.hbase-operator-tools.versions") hello_world = importlib.import_module("hello-world.versions") hive = importlib.import_module("hive.versions") java_base = importlib.import_module("java-base.versions") @@ -45,6 +48,9 @@ {"name": "druid", "versions": druid.versions}, {"name": "hadoop", "versions": hadoop.versions}, {"name": "hbase", "versions": hbase.versions}, + {"name": "hbase/phoenix", "versions": hbase_phoenix.versions}, + {"name": "hbase/hbase-opa-authorizer", "versions": hbase_opa_authorizer.versions}, + {"name": "hbase/hbase-operator-tools", "versions": hbase_operator_tools.versions}, {"name": "hello-world", "versions": hello_world.versions}, {"name": "hive", "versions": hive.versions}, {"name": "java-base", "versions": java_base.versions}, diff --git a/hbase/Dockerfile b/hbase/Dockerfile index 1b59478c2..55098c009 100644 --- a/hbase/Dockerfile +++ b/hbase/Dockerfile @@ -1,14 +1,11 @@ # syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5 # check=error=true -FROM stackable/image/hadoop AS hadoop-builder - FROM stackable/image/java-devel AS hbase-builder ARG PRODUCT -ARG HBASE_OPERATOR_TOOLS +ARG HBASE_HBASE_OPERATOR_TOOLS ARG ASYNC_PROFILER -ARG PHOENIX ARG HBASE_PROFILE ARG HADOOP ARG TARGETARCH @@ -95,113 +92,6 @@ fi chmod --recursive g=u /stackable EOF - -FROM stackable/image/java-devel AS opa-authorizer-builder - -ARG PRODUCT -ARG OPA_AUTHORIZER -ARG DELETE_CACHES -ARG STACKABLE_USER_UID - -USER ${STACKABLE_USER_UID} -WORKDIR /stackable - -# Use the product version as cache id "maven-opa-${PRODUCT}" to avoid the "rm -rf" problem described above. -# Using the OPA_AUTHORIZER arg is not unique if the same version is used for multiple products. -RUN --mount=type=cache,id=maven-opa-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository < /stackable/bin/hbck2 -chmod +x /stackable/bin/hbck2 -rm /stackable/bin/hbck2.env - -# We're removing these to make the intermediate layer smaller -# This can be necessary even though it's only a builder image because the GitHub Action Runners only have very limited space available -# and we are sometimes running into errors because we're out of space. -# Therefore, we try to clean up all layers as much as possible. -if [ "${DELETE_CACHES}" = "true" ] ; then - rm -rf /stackable/.m2/repository/* - rm -rf /stackable/.npm/* - rm -rf /stackable/.cache/* -fi - -# set correct groups -chmod --recursive g=u /stackable -EOF - - # Splitting this out into its own builder so that Hadoop & HBase can be built in parallel # envsubst is only available in java-devel which is why we don't just do this in the final image FROM stackable/image/java-devel AS hadoop-s3-builder @@ -213,7 +103,7 @@ ARG STACKABLE_USER_UID USER ${STACKABLE_USER_UID} WORKDIR /stackable -COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 \ +COPY --from=stackable/image/hadoop --chown=${STACKABLE_USER_UID}:0 \ # The artifact name of the AWS bundle has changed between Haddop 3.3.6 and 3.4.1 # from aws-java-sdk-bundle-*.jar to bundle-*.jar. # See: https://hadoop.apache.org/docs/stable/hadoop-aws/tools/hadoop-aws/aws_sdk_upgrade.html @@ -240,76 +130,14 @@ rm /stackable/bin/export-snapshot-to-s3.env chmod --recursive g=u /stackable EOF - -FROM stackable/image/java-devel AS phoenix-builder - -ARG PRODUCT -ARG ASYNC_PROFILER -ARG PHOENIX -ARG HBASE_PROFILE -ARG HADOOP -ARG STACKABLE_USER_UID - -# Setting this to anything other than "true" will keep the cache folders around (e.g. for Maven, NPM etc.) -# This can be used to speed up builds when disk space is of no concern. -ARG DELETE_CACHES="true" - -COPY --chown=${STACKABLE_USER_UID}:0 hbase/phoenix/stackable/patches/patchable.toml /stackable/src/phoenix/stackable/patches/patchable.toml -COPY --chown=${STACKABLE_USER_UID}:0 hbase/phoenix/stackable/patches/${PHOENIX} /stackable/src/phoenix/stackable/patches/${PHOENIX} -USER ${STACKABLE_USER_UID} -WORKDIR /stackable - -RUN --mount=type=cache,id=maven-phoenix-${PHOENIX}-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository < /stackable/bin/hbck2 +chmod +x /stackable/bin/hbck2 +rm /stackable/bin/hbck2.env + +# We're removing these to make the intermediate layer smaller +# This can be necessary even though it's only a builder image because the GitHub Action Runners only have very limited space available +# and we are sometimes running into errors because we're out of space. +# Therefore, we try to clean up all layers as much as possible. +if [ "${DELETE_CACHES}" = "true" ] ; then + rm -rf /stackable/.m2/repository/* + rm -rf /stackable/.npm/* + rm -rf /stackable/.cache/* +fi + +# set correct groups +chmod --recursive g=u /stackable +EOF \ No newline at end of file diff --git a/hbase/hbase-operator-tools/versions.py b/hbase/hbase-operator-tools/versions.py new file mode 100644 index 000000000..22a6aaf41 --- /dev/null +++ b/hbase/hbase-operator-tools/versions.py @@ -0,0 +1,16 @@ +versions = [ + { + "product": "1.2.0", + "hbase_thirdparty": "4.1.5", + "hbase_version": "2.4.18", + "java-devel": "11", + "delete_caches": "true", + }, + { + "product": "1.3.0-fd5a5fb", + "hbase_thirdparty": "4.1.9", + "hbase_version": "2.6.1", + "java-devel": "11", + "delete_caches": "true", + }, +] diff --git a/hbase/phoenix/Dockerfile b/hbase/phoenix/Dockerfile new file mode 100644 index 000000000..2d9273b3c --- /dev/null +++ b/hbase/phoenix/Dockerfile @@ -0,0 +1,57 @@ +FROM stackable/image/java-devel + +ARG PRODUCT +ARG ASYNC_PROFILER +ARG HBASE_VERSION +ARG HBASE_PROFILE +ARG HADOOP_VERSION +ARG STACKABLE_USER_UID + +# Setting this to anything other than "true" will keep the cache folders around (e.g. for Maven, NPM etc.) +# This can be used to speed up builds when disk space is of no concern. +ARG DELETE_CACHES="true" + +COPY --chown=${STACKABLE_USER_UID}:0 hbase/phoenix/stackable/patches/patchable.toml /stackable/src/phoenix/stackable/patches/patchable.toml +COPY --chown=${STACKABLE_USER_UID}:0 hbase/phoenix/stackable/patches/${PRODUCT} /stackable/src/phoenix/stackable/patches/${PRODUCT} +USER ${STACKABLE_USER_UID} +WORKDIR /stackable + +RUN --mount=type=cache,id=maven-phoenix-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository < Date: Mon, 19 May 2025 09:17:10 +0200 Subject: [PATCH 3/7] chore: hadolint fixes --- hbase/hbase-opa-authorizer/Dockerfile | 2 +- hbase/hbase-opa-authorizer/versions.py | 2 +- hbase/hbase-operator-tools/Dockerfile | 2 +- nifi/iceberg-bundle/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hbase/hbase-opa-authorizer/Dockerfile b/hbase/hbase-opa-authorizer/Dockerfile index 1f79965a6..b2e5e723c 100644 --- a/hbase/hbase-opa-authorizer/Dockerfile +++ b/hbase/hbase-opa-authorizer/Dockerfile @@ -32,4 +32,4 @@ fi # set correct groups chmod --recursive g=u /stackable -EOF \ No newline at end of file +EOF diff --git a/hbase/hbase-opa-authorizer/versions.py b/hbase/hbase-opa-authorizer/versions.py index 877b9ecf9..cd1f2934f 100644 --- a/hbase/hbase-opa-authorizer/versions.py +++ b/hbase/hbase-opa-authorizer/versions.py @@ -4,4 +4,4 @@ "java-devel": "11", "delete_caches": "true", }, -] \ No newline at end of file +] diff --git a/hbase/hbase-operator-tools/Dockerfile b/hbase/hbase-operator-tools/Dockerfile index e395cfbec..80676e0ea 100644 --- a/hbase/hbase-operator-tools/Dockerfile +++ b/hbase/hbase-operator-tools/Dockerfile @@ -61,4 +61,4 @@ fi # set correct groups chmod --recursive g=u /stackable -EOF \ No newline at end of file +EOF diff --git a/nifi/iceberg-bundle/Dockerfile b/nifi/iceberg-bundle/Dockerfile index 0b444de76..0cb0e6506 100644 --- a/nifi/iceberg-bundle/Dockerfile +++ b/nifi/iceberg-bundle/Dockerfile @@ -35,4 +35,4 @@ rm -rf nifi-iceberg-bundle-${PRODUCT} # Set correct groups chmod g=u /stackable/*.nar chmod g=u /stackable/*.sbom.json -EOF \ No newline at end of file +EOF From c12beb35ad889fecfc8a83bef929fdeead3e81d9 Mon Sep 17 00:00:00 2001 From: dervoeti Date: Mon, 19 May 2025 10:11:41 +0200 Subject: [PATCH 4/7] chore: hadolint fixes --- airflow/Dockerfile | 6 ++++-- hbase/Dockerfile | 22 +++++++++++++++------- kafka-testing-tools/Dockerfile | 6 ++++-- kafka/Dockerfile | 6 ++++-- kafka/kcat/Dockerfile | 2 +- nifi/Dockerfile | 6 ++++-- superset/Dockerfile | 6 ++++-- trino/Dockerfile | 4 +++- trino/storage-connector/Dockerfile | 4 ++-- 9 files changed, 41 insertions(+), 21 deletions(-) diff --git a/airflow/Dockerfile b/airflow/Dockerfile index a353c9b35..c5bcfff4f 100644 --- a/airflow/Dockerfile +++ b/airflow/Dockerfile @@ -7,6 +7,8 @@ ARG GIT_SYNC # which should contain a image location (e.g. registry.k8s.io/git-sync/git-sync:v3.6.8) FROM oci.stackable.tech/sdp/git-sync/git-sync:${GIT_SYNC} AS gitsync-image +FROM stackable/image/shared/statsd-exporter AS statsd_exporter-builder + FROM python:3.12-bookworm AS opa-auth-manager-builder COPY airflow/opa-auth-manager/ /tmp/opa-auth-manager @@ -92,8 +94,8 @@ else end)' /tmp/sbom.json > /stackable/app/airflow-${PRODUCT}.cdx.json EOF -COPY --from=stackable/image/shared/statsd-exporter /statsd_exporter/statsd_exporter /stackable/statsd_exporter -COPY --from=stackable/image/shared/statsd-exporter /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json +COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter /stackable/statsd_exporter +COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json COPY --from=gitsync-image --chown=${STACKABLE_USER_UID}:0 /git-sync /stackable/git-sync RUN < Date: Mon, 19 May 2025 11:39:49 +0200 Subject: [PATCH 5/7] chore(omid): update images for release 25.7.0 (#1105) * chore(omid): bump to version 1.1.3 * update changelog * fix 1.1.3/patachable.toml * fix markdown lint --- CHANGELOG.md | 3 ++ .../1.1.0/0001-Add-CycloneDX-plugin.patch | 38 ------------------- omid/stackable/patches/1.1.0/patchable.toml | 2 - .../1.1.1/0001-Add-CycloneDX-plugin.patch | 38 ------------------- omid/stackable/patches/1.1.1/patchable.toml | 2 - .../0001-Add-CycloneDX-plugin.patch | 4 +- .../{1.1.3-SNAPSHOT => 1.1.3}/patchable.toml | 2 +- omid/versions.py | 2 +- 8 files changed, 7 insertions(+), 84 deletions(-) delete mode 100644 omid/stackable/patches/1.1.0/0001-Add-CycloneDX-plugin.patch delete mode 100644 omid/stackable/patches/1.1.0/patchable.toml delete mode 100644 omid/stackable/patches/1.1.1/0001-Add-CycloneDX-plugin.patch delete mode 100644 omid/stackable/patches/1.1.1/patchable.toml rename omid/stackable/patches/{1.1.3-SNAPSHOT => 1.1.3}/0001-Add-CycloneDX-plugin.patch (91%) rename omid/stackable/patches/{1.1.3-SNAPSHOT => 1.1.3}/patchable.toml (54%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cad322f1..e053f2d0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ All notable changes to this project will be documented in this file. `check-permissions-ownership.sh` provided in stackable-base image ([#1043]). - java: Add JDK 24 ([#1097]). - ci: Add golang image to mirror workflow ([#1103]). +- omid: bump version to 1.1.3 ([#1105]) - hbase: add 2.6.2 and upgrade dependencies ([#1101]) ### Changed @@ -85,6 +86,7 @@ All notable changes to this project will be documented in this file. - hadoop: Remove `3.3.4` and `3.4.0` ([#1099]). - opa: Remove `0.67.1` ([#1103]). - opa: Remove legacy bundle-builder from container build ([#1103]). +- omid: Remove 1.1.3-SNAPSHOT ([#1105]). - hbase: Remove 2.4.18 ([#1101]) - druid: Remove `30.0.0` ([#1110]). - nifi: Remove `2.2.0` ([#1114]). @@ -119,6 +121,7 @@ All notable changes to this project will be documented in this file. [#1101]: https://github.com/stackabletech/docker-images/pull/1101 [#1102]: https://github.com/stackabletech/docker-images/pull/1102 [#1103]: https://github.com/stackabletech/docker-images/pull/1103 +[#1105]: https://github.com/stackabletech/docker-images/pull/1105 [#1106]: https://github.com/stackabletech/docker-images/pull/1106 [#1107]: https://github.com/stackabletech/docker-images/pull/1107 [#1108]: https://github.com/stackabletech/docker-images/pull/1108 diff --git a/omid/stackable/patches/1.1.0/0001-Add-CycloneDX-plugin.patch b/omid/stackable/patches/1.1.0/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index a5d55124a..000000000 --- a/omid/stackable/patches/1.1.0/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c0faa62430ebcb80b0c2dba2acfbbe072e246ad4 Mon Sep 17 00:00:00 2001 -From: Lukas Voetmand -Date: Sun, 8 Sep 2024 15:50:23 +0200 -Subject: Add CycloneDX plugin - ---- - pom.xml | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/pom.xml b/pom.xml -index b7f4e4755..1b6a2825a 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -458,6 +458,24 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ -+ -+ -+ package -+ -+ makeBom -+ -+ -+ -+ -+ - - - diff --git a/omid/stackable/patches/1.1.0/patchable.toml b/omid/stackable/patches/1.1.0/patchable.toml deleted file mode 100644 index 9fc718c99..000000000 --- a/omid/stackable/patches/1.1.0/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -base = "3b9e16b7537adbc90a7403507fb8aabd8d1fab0c" -mirror = "https://github.com/stackabletech/phoenix-omid.git" diff --git a/omid/stackable/patches/1.1.1/0001-Add-CycloneDX-plugin.patch b/omid/stackable/patches/1.1.1/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index 39e49bf61..000000000 --- a/omid/stackable/patches/1.1.1/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 058c598a2729a9f16a5229b9e50ebb6734ede082 Mon Sep 17 00:00:00 2001 -From: Lukas Voetmand -Date: Sun, 8 Sep 2024 15:50:23 +0200 -Subject: Add CycloneDX plugin - ---- - pom.xml | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/pom.xml b/pom.xml -index f9dc9e602..f2ab95317 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -498,6 +498,24 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ -+ -+ -+ package -+ -+ makeBom -+ -+ -+ -+ -+ - - - diff --git a/omid/stackable/patches/1.1.1/patchable.toml b/omid/stackable/patches/1.1.1/patchable.toml deleted file mode 100644 index 5f9cf06a6..000000000 --- a/omid/stackable/patches/1.1.1/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -base = "cd546d58d93f380fec9bf65dbfa618f53493f662" -mirror = "https://github.com/stackabletech/phoenix-omid.git" diff --git a/omid/stackable/patches/1.1.3-SNAPSHOT/0001-Add-CycloneDX-plugin.patch b/omid/stackable/patches/1.1.3/0001-Add-CycloneDX-plugin.patch similarity index 91% rename from omid/stackable/patches/1.1.3-SNAPSHOT/0001-Add-CycloneDX-plugin.patch rename to omid/stackable/patches/1.1.3/0001-Add-CycloneDX-plugin.patch index efe0481ee..95612913c 100644 --- a/omid/stackable/patches/1.1.3-SNAPSHOT/0001-Add-CycloneDX-plugin.patch +++ b/omid/stackable/patches/1.1.3/0001-Add-CycloneDX-plugin.patch @@ -1,4 +1,4 @@ -From 1296e08c2d202b6b6a4efc5da8670ecd07c7a66c Mon Sep 17 00:00:00 2001 +From 92704fc8ae1615d6b4fb6958c08d691089f21186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Tue, 18 Mar 2025 21:37:35 +0100 Subject: Add CycloneDX plugin @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml -index 9656bdbe..7a2b114f 100644 +index a63c2505..51555d30 100644 --- a/pom.xml +++ b/pom.xml @@ -556,6 +556,23 @@ diff --git a/omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml b/omid/stackable/patches/1.1.3/patchable.toml similarity index 54% rename from omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml rename to omid/stackable/patches/1.1.3/patchable.toml index b69b3f86c..820a8dd97 100644 --- a/omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml +++ b/omid/stackable/patches/1.1.3/patchable.toml @@ -1,2 +1,2 @@ -base = "c3e4da626fdb27060fd139a809e057965e52d163" +base = "eb686f11f67e21d1a76361003c14135d97367691" mirror = "https://github.com/stackabletech/phoenix-omid.git" diff --git a/omid/versions.py b/omid/versions.py index 6ae6947b5..294432d52 100644 --- a/omid/versions.py +++ b/omid/versions.py @@ -6,7 +6,7 @@ "jmx_exporter": "1.2.0", }, { - "product": "1.1.3-SNAPSHOT", + "product": "1.1.3", "java-base": "11", "java-devel": "11", "jmx_exporter": "1.2.0", From 344d222fac04ea45f29253f014a6c2f192008d0e Mon Sep 17 00:00:00 2001 From: dervoeti Date: Mon, 19 May 2025 12:32:41 +0200 Subject: [PATCH 6/7] chore: update image-tools to 0.0.16 --- .github/ISSUE_TEMPLATE/update-base-java.md | 2 +- .github/ISSUE_TEMPLATE/update-base-stackable.md | 2 +- .github/ISSUE_TEMPLATE/update-base-vector.md | 2 +- .github/ISSUE_TEMPLATE/update-product-airflow.md | 2 +- .github/ISSUE_TEMPLATE/update-product-druid.md | 2 +- .github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md | 2 +- .github/ISSUE_TEMPLATE/update-product-hdfs.md | 2 +- .github/ISSUE_TEMPLATE/update-product-hive.md | 2 +- .github/ISSUE_TEMPLATE/update-product-kafka.md | 2 +- .github/ISSUE_TEMPLATE/update-product-nifi.md | 2 +- .github/ISSUE_TEMPLATE/update-product-opa.md | 2 +- .github/ISSUE_TEMPLATE/update-product-spark.md | 2 +- .github/ISSUE_TEMPLATE/update-product-superset.md | 2 +- .github/ISSUE_TEMPLATE/update-product-trino.md | 2 +- .github/ISSUE_TEMPLATE/update-product-zookeeper.md | 2 +- .github/workflows/preflight.yaml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/update-base-java.md b/.github/ISSUE_TEMPLATE/update-base-java.md index b29a47cb0..69efe017d 100644 --- a/.github/ISSUE_TEMPLATE/update-base-java.md +++ b/.github/ISSUE_TEMPLATE/update-base-java.md @@ -63,7 +63,7 @@ we should also make new versions of Java available for use. ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 # Test a product image can build, eg: ZooKeeper bake --product zookeeper=x.y.z # where x.y.z is a valid product version using the newly added Java version diff --git a/.github/ISSUE_TEMPLATE/update-base-stackable.md b/.github/ISSUE_TEMPLATE/update-base-stackable.md index 1d20147cf..ebb154ba2 100644 --- a/.github/ISSUE_TEMPLATE/update-base-stackable.md +++ b/.github/ISSUE_TEMPLATE/update-base-stackable.md @@ -52,7 +52,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product vector=x.y.z # where x.y.z is a valid version ``` diff --git a/.github/ISSUE_TEMPLATE/update-base-vector.md b/.github/ISSUE_TEMPLATE/update-base-vector.md index 43ea66ea6..2a8c28e55 100644 --- a/.github/ISSUE_TEMPLATE/update-base-vector.md +++ b/.github/ISSUE_TEMPLATE/update-base-vector.md @@ -70,7 +70,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product vector=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-airflow.md b/.github/ISSUE_TEMPLATE/update-product-airflow.md index 80f608ced..158b10e8f 100644 --- a/.github/ISSUE_TEMPLATE/update-product-airflow.md +++ b/.github/ISSUE_TEMPLATE/update-product-airflow.md @@ -63,7 +63,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product airflow=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-druid.md b/.github/ISSUE_TEMPLATE/update-product-druid.md index 2305bffb0..04e750553 100644 --- a/.github/ISSUE_TEMPLATE/update-product-druid.md +++ b/.github/ISSUE_TEMPLATE/update-product-druid.md @@ -67,7 +67,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product druid=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md b/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md index 88a5768db..633be0368 100644 --- a/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md +++ b/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md @@ -71,7 +71,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product hbase=x.y.z # where x.y.z is the new version added in this PR bake --product omid=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-hdfs.md b/.github/ISSUE_TEMPLATE/update-product-hdfs.md index 1f9b13419..cf3b63350 100644 --- a/.github/ISSUE_TEMPLATE/update-product-hdfs.md +++ b/.github/ISSUE_TEMPLATE/update-product-hdfs.md @@ -64,7 +64,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product hadoop=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-hive.md b/.github/ISSUE_TEMPLATE/update-product-hive.md index 7afa60fca..1da166f1e 100644 --- a/.github/ISSUE_TEMPLATE/update-product-hive.md +++ b/.github/ISSUE_TEMPLATE/update-product-hive.md @@ -64,7 +64,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product hive=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-kafka.md b/.github/ISSUE_TEMPLATE/update-product-kafka.md index cff61c59c..51d37ed77 100644 --- a/.github/ISSUE_TEMPLATE/update-product-kafka.md +++ b/.github/ISSUE_TEMPLATE/update-product-kafka.md @@ -76,7 +76,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product kafka=x.y.z # where x.y.z is the new version added in this PR bake --product kafka-testing-tools=1.0.0 # This version doesn't change diff --git a/.github/ISSUE_TEMPLATE/update-product-nifi.md b/.github/ISSUE_TEMPLATE/update-product-nifi.md index 078bc1680..16e3fdc75 100644 --- a/.github/ISSUE_TEMPLATE/update-product-nifi.md +++ b/.github/ISSUE_TEMPLATE/update-product-nifi.md @@ -63,7 +63,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product nifi=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-opa.md b/.github/ISSUE_TEMPLATE/update-product-opa.md index b49776b42..f0312208d 100644 --- a/.github/ISSUE_TEMPLATE/update-product-opa.md +++ b/.github/ISSUE_TEMPLATE/update-product-opa.md @@ -62,7 +62,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product opa=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-spark.md b/.github/ISSUE_TEMPLATE/update-product-spark.md index 30e4be6ff..0ea2a4ca4 100644 --- a/.github/ISSUE_TEMPLATE/update-product-spark.md +++ b/.github/ISSUE_TEMPLATE/update-product-spark.md @@ -64,7 +64,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product spark-k8s=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-superset.md b/.github/ISSUE_TEMPLATE/update-product-superset.md index c04169c4d..1f32cd504 100644 --- a/.github/ISSUE_TEMPLATE/update-product-superset.md +++ b/.github/ISSUE_TEMPLATE/update-product-superset.md @@ -65,7 +65,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product superset=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-trino.md b/.github/ISSUE_TEMPLATE/update-product-trino.md index 06656a38e..8f3683380 100644 --- a/.github/ISSUE_TEMPLATE/update-product-trino.md +++ b/.github/ISSUE_TEMPLATE/update-product-trino.md @@ -73,7 +73,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product trino=x.y.z # where x.y.z is the new version added in this PR bake --product trino-cli=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/ISSUE_TEMPLATE/update-product-zookeeper.md b/.github/ISSUE_TEMPLATE/update-product-zookeeper.md index 0f2f5ca44..b520c2e6d 100644 --- a/.github/ISSUE_TEMPLATE/update-product-zookeeper.md +++ b/.github/ISSUE_TEMPLATE/update-product-zookeeper.md @@ -63,7 +63,7 @@ Add/Change/Remove anything that isn't applicable anymore ```shell # See the latest version at https://pypi.org/project/image-tools-stackabletech/ -pip install image-tools-stackabletech==0.0.13 +pip install image-tools-stackabletech==0.0.16 bake --product zookeeper=x.y.z # where x.y.z is the new version added in this PR diff --git a/.github/workflows/preflight.yaml b/.github/workflows/preflight.yaml index 76c229987..ca2f6cbc7 100644 --- a/.github/workflows/preflight.yaml +++ b/.github/workflows/preflight.yaml @@ -80,7 +80,7 @@ jobs: - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 with: python-version: '3.x' - - run: pip install image-tools-stackabletech==0.0.13 + - run: pip install image-tools-stackabletech==0.0.16 - name: Install preflight run: | wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/1.10.0/preflight-linux-amd64 From d6c30a65002989985d416a92755dab4974803447 Mon Sep 17 00:00:00 2001 From: dervoeti Date: Mon, 19 May 2025 12:39:27 +0200 Subject: [PATCH 7/7] chore: update stackable gh action to include latest version of image-tools --- .github/workflows/mirror.yaml | 4 ++-- .github/workflows/pr_pre-commit.yaml | 2 +- .github/workflows/reusable_build_image.yaml | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/mirror.yaml b/.github/workflows/mirror.yaml index bc03df794..f4cfc35a5 100644 --- a/.github/workflows/mirror.yaml +++ b/.github/workflows/mirror.yaml @@ -57,7 +57,7 @@ jobs: echo "IMAGE_REPOSITORY=$(.scripts/get_repo_name.sh)" | tee -a "$GITHUB_ENV" - name: Publish Container Image on oci.stackable.tech - uses: stackabletech/actions/publish-image@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1 + uses: stackabletech/actions/publish-image@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2 with: image-registry-uri: oci.stackable.tech image-registry-username: robot$sdp+github-action-build @@ -84,7 +84,7 @@ jobs: echo "IMAGE_REPOSITORY=$(.scripts/get_repo_name.sh)" | tee -a "$GITHUB_ENV" - name: Publish and Sign Image Index Manifest to oci.stackable.tech - uses: stackabletech/actions/publish-index-manifest@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1 + uses: stackabletech/actions/publish-index-manifest@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2 with: image-registry-uri: oci.stackable.tech image-registry-username: robot$sdp+github-action-build diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml index ded4d5a31..c84a5aa00 100644 --- a/.github/workflows/pr_pre-commit.yaml +++ b/.github/workflows/pr_pre-commit.yaml @@ -16,7 +16,7 @@ jobs: with: persist-credentials: false fetch-depth: 0 - - uses: stackabletech/actions/run-pre-commit@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1 + - uses: stackabletech/actions/run-pre-commit@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2 with: python-version: ${{ env.PYTHON_VERSION }} hadolint: ${{ env.HADOLINT_VERSION }} diff --git a/.github/workflows/reusable_build_image.yaml b/.github/workflows/reusable_build_image.yaml index 33c63de71..7a54dbb7f 100644 --- a/.github/workflows/reusable_build_image.yaml +++ b/.github/workflows/reusable_build_image.yaml @@ -27,7 +27,7 @@ jobs: with: persist-credentials: false - id: shard - uses: stackabletech/actions/shard@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1 + uses: stackabletech/actions/shard@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2 with: product-name: ${{ inputs.product-name }} outputs: @@ -53,18 +53,18 @@ jobs: persist-credentials: false - name: Free Disk Space - uses: stackabletech/actions/free-disk-space@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1 + uses: stackabletech/actions/free-disk-space@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2 - name: Build Product Image id: build - uses: stackabletech/actions/build-product-image@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1 + uses: stackabletech/actions/build-product-image@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2 with: product-name: ${{ inputs.product-name }} product-version: ${{ matrix.versions }} sdp-version: ${{ inputs.sdp-version }} - name: Publish Container Image on oci.stackable.tech - uses: stackabletech/actions/publish-image@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1 + uses: stackabletech/actions/publish-image@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2 with: image-registry-uri: oci.stackable.tech image-registry-username: robot$${{ inputs.registry-namespace }}+github-action-build @@ -90,7 +90,7 @@ jobs: persist-credentials: false - name: Publish and Sign Image Index Manifest to oci.stackable.tech - uses: stackabletech/actions/publish-index-manifest@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1 + uses: stackabletech/actions/publish-index-manifest@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2 with: image-registry-uri: oci.stackable.tech image-registry-username: robot$${{ inputs.registry-namespace }}+github-action-build