From a64f2b6585de269ed03a51a7b01835d930d2df56 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 15 Jan 2026 21:53:20 +0100 Subject: [PATCH 1/4] chore(trino-cli): Bump to 479 --- java-base/boil-config.toml | 3 +++ trino-cli/boil-config.toml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/java-base/boil-config.toml b/java-base/boil-config.toml index 9cf094094..af98dd2ab 100644 --- a/java-base/boil-config.toml +++ b/java-base/boil-config.toml @@ -18,3 +18,6 @@ vector = "0.52.0" [versions."24".local-images] vector = "0.52.0" + +[versions."25".local-images] +vector = "0.52.0" diff --git a/trino-cli/boil-config.toml b/trino-cli/boil-config.toml index 84b5de192..440f7156d 100644 --- a/trino-cli/boil-config.toml +++ b/trino-cli/boil-config.toml @@ -1,2 +1,2 @@ -[versions."477".local-images] -java-base = "24" +[versions."479".local-images] +java-base = "25" From 6cf21194362d8c09e9848e8a02c14aa48fd05abc Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 15 Jan 2026 23:59:11 +0100 Subject: [PATCH 2/4] chore(trino): Add 479, remove 451 and 476 --- java-devel/boil-config.toml | 3 ++ trino/Dockerfile | 7 ++-- trino/boil-config.toml | 26 +++++-------- trino/storage-connector/boil-config.toml | 12 ++---- .../451/0001-Add-CycloneDX-plugin.patch | 38 ------------------ .../stackable/patches/451/patchable.toml | 2 - .../476/0001-Add-CycloneDX-plugin.patch | 38 ------------------ .../stackable/patches/476/patchable.toml | 2 - trino/trino/boil-config.toml | 9 ++--- .../451/0001-Add-CycloneDX-plugin.patch | 39 ------------------- .../stackable/patches/476/patchable.toml | 2 - .../0001-Add-CycloneDX-plugin.patch | 6 +-- ...ode-checking-because-flow-v0.241.0-f.patch | 6 +-- .../patches/{451 => 479}/patchable.toml | 2 +- 14 files changed, 31 insertions(+), 161 deletions(-) delete mode 100644 trino/storage-connector/stackable/patches/451/0001-Add-CycloneDX-plugin.patch delete mode 100644 trino/storage-connector/stackable/patches/451/patchable.toml delete mode 100644 trino/storage-connector/stackable/patches/476/0001-Add-CycloneDX-plugin.patch delete mode 100644 trino/storage-connector/stackable/patches/476/patchable.toml delete mode 100644 trino/trino/stackable/patches/451/0001-Add-CycloneDX-plugin.patch delete mode 100644 trino/trino/stackable/patches/476/patchable.toml rename trino/trino/stackable/patches/{476 => 479}/0001-Add-CycloneDX-plugin.patch (90%) rename trino/trino/stackable/patches/{476 => 479}/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch (93%) rename trino/trino/stackable/patches/{451 => 479}/patchable.toml (51%) diff --git a/java-devel/boil-config.toml b/java-devel/boil-config.toml index b6d750b42..4e3943ef0 100644 --- a/java-devel/boil-config.toml +++ b/java-devel/boil-config.toml @@ -18,3 +18,6 @@ stackable-devel = "1.0.0" [versions."24".local-images] stackable-devel = "1.0.0" + +[versions."25".local-images] +stackable-devel = "1.0.0" diff --git a/trino/Dockerfile b/trino/Dockerfile index 823d9fe2c..f95e683a4 100644 --- a/trino/Dockerfile +++ b/trino/Dockerfile @@ -8,6 +8,7 @@ FROM local-image/trino/trino AS trino-builder FROM local-image/java-base ARG PRODUCT_VERSION +ARG TRINO_STORAGE_CONNECTOR_VERSION ARG RELEASE_VERSION ARG STACKABLE_USER_UID ARG JMX_EXPORTER_VERSION @@ -38,9 +39,9 @@ EOF COPY --from=trino-builder --chown=${STACKABLE_USER_UID}:0 /stackable/trino-server /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} COPY --chown=${STACKABLE_USER_UID}:0 trino/licenses /licenses -COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${PRODUCT_VERSION}/target/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugin/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} -COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${PRODUCT_VERSION}/target/bom.json /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugin/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json -COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/trino-storage-connector-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable +COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${TRINO_STORAGE_CONNECTOR_VERSION}/target/trino-storage-${TRINO_STORAGE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION} /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugin/trino-storage-${TRINO_STORAGE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION} +COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${TRINO_STORAGE_CONNECTOR_VERSION}/target/bom.json /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugin/trino-storage-${TRINO_STORAGE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}/trino-storage-${TRINO_STORAGE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}.cdx.json +COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/trino-storage-connector-${TRINO_STORAGE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/jmx /stackable/jmx diff --git a/trino/boil-config.toml b/trino/boil-config.toml index 206f75614..00147c5f3 100644 --- a/trino/boil-config.toml +++ b/trino/boil-config.toml @@ -1,19 +1,3 @@ -[versions."451".local-images] -java-base = "22" -"trino/trino" = "451" -"trino/storage-connector" = "451" - -[versions."451".build-arguments] -jmx-exporter-version = "1.3.0" - -[versions."476".local-images] -java-base = "24" -"trino/trino" = "476" -"trino/storage-connector" = "476" - -[versions."476".build-arguments] -jmx-exporter-version = "1.3.0" - [versions."477".local-images] java-base = "24" "trino/trino" = "477" @@ -21,3 +5,13 @@ java-base = "24" [versions."477".build-arguments] jmx-exporter-version = "1.3.0" + +[versions."479".local-images] +java-base = "25" +"trino/trino" = "479" +"trino/storage-connector" = "477" +# There is no 479 connector yet +# "trino/storage-connector" = "479" + +[versions."479".build-arguments] +jmx-exporter-version = "1.3.0" diff --git a/trino/storage-connector/boil-config.toml b/trino/storage-connector/boil-config.toml index e1dfd99f0..c385cc378 100644 --- a/trino/storage-connector/boil-config.toml +++ b/trino/storage-connector/boil-config.toml @@ -1,11 +1,7 @@ -[versions."451".local-images] -"trino/trino" = "451" -java-devel = "22" - -[versions."476".local-images] -"trino/trino" = "476" -java-devel = "24" - [versions."477".local-images] "trino/trino" = "477" java-devel = "24" + +[versions."479".local-images] +"trino/trino" = "479" +java-devel = "25" diff --git a/trino/storage-connector/stackable/patches/451/0001-Add-CycloneDX-plugin.patch b/trino/storage-connector/stackable/patches/451/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index 5641ea839..000000000 --- a/trino/storage-connector/stackable/patches/451/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c14ba9cd92451a2c8a7ad7da2ff2e3f5cdbf2201 Mon Sep 17 00:00:00 2001 -From: Lukas Voetmand -Date: Fri, 6 Sep 2024 17:53:52 +0200 -Subject: Add CycloneDX plugin - ---- - pom.xml | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/pom.xml b/pom.xml -index 7304dac..d73dacf 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -544,6 +544,24 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ false -+ -+ -+ -+ -+ makeBom -+ -+ package -+ -+ -+ - - - diff --git a/trino/storage-connector/stackable/patches/451/patchable.toml b/trino/storage-connector/stackable/patches/451/patchable.toml deleted file mode 100644 index 938a7d526..000000000 --- a/trino/storage-connector/stackable/patches/451/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -base = "b6e5825bb84a4f1a3f89ff45ea39ce349313f60a" -mirror = "https://github.com/stackabletech/trino-storage.git" diff --git a/trino/storage-connector/stackable/patches/476/0001-Add-CycloneDX-plugin.patch b/trino/storage-connector/stackable/patches/476/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index 7f70be73f..000000000 --- a/trino/storage-connector/stackable/patches/476/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From dd682ba1999455aefc683003cada4fe1677d909c Mon Sep 17 00:00:00 2001 -From: Lukas Voetmand -Date: Fri, 6 Sep 2024 17:53:52 +0200 -Subject: Add CycloneDX plugin - ---- - pom.xml | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/pom.xml b/pom.xml -index 5433be6..c3f2fc7 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -584,6 +584,24 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.9.1 -+ -+ application -+ 1.6 -+ false -+ -+ -+ -+ -+ makeBom -+ -+ package -+ -+ -+ - - - diff --git a/trino/storage-connector/stackable/patches/476/patchable.toml b/trino/storage-connector/stackable/patches/476/patchable.toml deleted file mode 100644 index 0358fea9f..000000000 --- a/trino/storage-connector/stackable/patches/476/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -mirror = "https://github.com/stackabletech/trino-storage.git" -base = "1729ac627e9d5549f414c64060bee0c0d97fde01" diff --git a/trino/trino/boil-config.toml b/trino/trino/boil-config.toml index 1b3da4be7..93f7165c4 100644 --- a/trino/trino/boil-config.toml +++ b/trino/trino/boil-config.toml @@ -1,8 +1,5 @@ -[versions."451".local-images] -java-devel = "22" - -[versions."476".local-images] -java-devel = "24" - [versions."477".local-images] java-devel = "24" + +[versions."479".local-images] +java-devel = "25" diff --git a/trino/trino/stackable/patches/451/0001-Add-CycloneDX-plugin.patch b/trino/trino/stackable/patches/451/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index 809cee2a5..000000000 --- a/trino/trino/stackable/patches/451/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cbad32c6095469bb7c15e45d3b740ee35db47253 Mon Sep 17 00:00:00 2001 -From: Lukas Voetmand -Date: Fri, 6 Sep 2024 17:53:52 +0200 -Subject: Add CycloneDX plugin - ---- - pom.xml | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/pom.xml b/pom.xml -index 1c13fdab898..ceabf345e96 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -2642,6 +2642,25 @@ - - - -+ -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ false -+ -+ -+ -+ -+ makeBom -+ -+ package -+ -+ -+ - - - diff --git a/trino/trino/stackable/patches/476/patchable.toml b/trino/trino/stackable/patches/476/patchable.toml deleted file mode 100644 index 33b736d43..000000000 --- a/trino/trino/stackable/patches/476/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -mirror = "https://github.com/stackabletech/trino.git" -base = "7f3746a7fa0b27ace2470340e848feaf3ee73f48" diff --git a/trino/trino/stackable/patches/476/0001-Add-CycloneDX-plugin.patch b/trino/trino/stackable/patches/479/0001-Add-CycloneDX-plugin.patch similarity index 90% rename from trino/trino/stackable/patches/476/0001-Add-CycloneDX-plugin.patch rename to trino/trino/stackable/patches/479/0001-Add-CycloneDX-plugin.patch index 52d992e1a..94ac9b703 100644 --- a/trino/trino/stackable/patches/476/0001-Add-CycloneDX-plugin.patch +++ b/trino/trino/stackable/patches/479/0001-Add-CycloneDX-plugin.patch @@ -1,4 +1,4 @@ -From 8391e69280bcdb675faf36ce1a259f0aceb2e022 Mon Sep 17 00:00:00 2001 +From 2656e41f8828cacc5622693cccc0b06eec4e76b8 Mon Sep 17 00:00:00 2001 From: Lukas Voetmand Date: Fri, 6 Sep 2024 17:53:52 +0200 Subject: Add CycloneDX plugin @@ -8,10 +8,10 @@ Subject: Add CycloneDX plugin 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml -index 579d46b764..8e2d10ec16 100644 +index 22256f87ea2..9275b9691cf 100644 --- a/pom.xml +++ b/pom.xml -@@ -2834,6 +2834,24 @@ +@@ -2868,6 +2868,24 @@ diff --git a/trino/trino/stackable/patches/476/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch b/trino/trino/stackable/patches/479/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch similarity index 93% rename from trino/trino/stackable/patches/476/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch rename to trino/trino/stackable/patches/479/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch index c8c080232..5070097e2 100644 --- a/trino/trino/stackable/patches/476/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch +++ b/trino/trino/stackable/patches/479/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch @@ -1,4 +1,4 @@ -From c69033a355820753a49772be984b9c735ce8b92d Mon Sep 17 00:00:00 2001 +From 403776233d76994d21fb76c5e3ea89e82afca44e Mon Sep 17 00:00:00 2001 From: dervoeti Date: Wed, 18 Jun 2025 14:05:10 +0200 Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86 @@ -10,10 +10,10 @@ Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86 1 file changed, 22 deletions(-) diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml -index a783c8f989..bea233cfb9 100644 +index 565a5adf0c0..e172db8dabb 100644 --- a/core/trino-web-ui/pom.xml +++ b/core/trino-web-ui/pom.xml -@@ -103,28 +103,6 @@ +@@ -104,28 +104,6 @@ src/main/resources/webapp/src diff --git a/trino/trino/stackable/patches/451/patchable.toml b/trino/trino/stackable/patches/479/patchable.toml similarity index 51% rename from trino/trino/stackable/patches/451/patchable.toml rename to trino/trino/stackable/patches/479/patchable.toml index 3a968d254..295664aca 100644 --- a/trino/trino/stackable/patches/451/patchable.toml +++ b/trino/trino/stackable/patches/479/patchable.toml @@ -1,2 +1,2 @@ -base = "2c974f7cb1d71e1f9f466941a317190a474fc432" mirror = "https://github.com/stackabletech/trino.git" +base = "1b3a3e39a657642b0c4f76a5439dae859f93b4b1" From f58217781bb1a65b61492eb476b9c17a1b34f321 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 16 Jan 2026 00:01:27 +0100 Subject: [PATCH 3/4] chore(java): Remove unused java versions --- java-base/boil-config.toml | 6 ------ java-devel/boil-config.toml | 5 ----- jdk-base/boil-config.toml | 14 -------------- 3 files changed, 25 deletions(-) diff --git a/java-base/boil-config.toml b/java-base/boil-config.toml index af98dd2ab..887e4c088 100644 --- a/java-base/boil-config.toml +++ b/java-base/boil-config.toml @@ -10,12 +10,6 @@ vector = "0.52.0" [versions."21".local-images] vector = "0.52.0" -[versions."22".local-images] -vector = "0.52.0" - -[versions."23".local-images] -vector = "0.52.0" - [versions."24".local-images] vector = "0.52.0" diff --git a/java-devel/boil-config.toml b/java-devel/boil-config.toml index 4e3943ef0..d42101fe4 100644 --- a/java-devel/boil-config.toml +++ b/java-devel/boil-config.toml @@ -10,11 +10,6 @@ stackable-devel = "1.0.0" [versions."21".local-images] stackable-devel = "1.0.0" -[versions."22".local-images] -stackable-devel = "1.0.0" - -[versions."23".local-images] -stackable-devel = "1.0.0" [versions."24".local-images] stackable-devel = "1.0.0" diff --git a/jdk-base/boil-config.toml b/jdk-base/boil-config.toml index 9cf094094..58a93e0b5 100644 --- a/jdk-base/boil-config.toml +++ b/jdk-base/boil-config.toml @@ -1,20 +1,6 @@ -[versions."8".local-images] -vector = "0.52.0" - -[versions."11".local-images] -vector = "0.52.0" - -[versions."17".local-images] -vector = "0.52.0" - [versions."21".local-images] vector = "0.52.0" -[versions."22".local-images] -vector = "0.52.0" - -[versions."23".local-images] -vector = "0.52.0" [versions."24".local-images] vector = "0.52.0" From ae543f29461cf13e8ad25796cd06f9388fe32d63 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 16 Jan 2026 00:09:01 +0100 Subject: [PATCH 4/4] chore: Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2c2da434..95aa6fa3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file. - opensearch-dashboards: Add `3.4.0` ([#1392]). - testing-tools: build testing tools subimages in workflow ([#1366]). - kafka: Add `4.1.1` ([#1395]). +- trino: Add `479` ([#1403]). ### Changed @@ -24,6 +25,7 @@ All notable changes to this project will be documented in this file. - hive: fixed 4.0.1 shaded hive-metastore-opa-authorizer jar by relocating dependencies ([#1356]). - testing-tools: fix: add kubectl and openssl ([#1367]). - trino: Backport Kafka offset handling to 477 ([#1373]). +- trino-cli: Bump to `479` ([#1403]). - ubi: Bumped ubi9 and ubi10 hashes ([#1386]). - vector: Bumped from 0.49.0 to 0.52.0 ([#1387]). @@ -34,6 +36,7 @@ All notable changes to this project will be documented in this file. - kafka: Remove `3.7.2` and `4.1.0` ([#1395]). - opa: Remove `1.4.2` ([#1396]). - zookeeper: Remove `3.9.3` ([#1401]). +- trino: Remove `451` and `476` ([#1403]). ### Fixed @@ -62,6 +65,7 @@ All notable changes to this project will be documented in this file. [#1395]: https://github.com/stackabletech/docker-images/pull/1395 [#1396]: https://github.com/stackabletech/docker-images/pull/1396 [#1401]: https://github.com/stackabletech/docker-images/pull/1401 +[#1403]: https://github.com/stackabletech/docker-images/pull/1403 ## [25.11.0] - 2025-11-07