chore(trino): Update images for 25.11.0

CHANGELOG.md

@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
 - superset: Add `4.1.4`  ([#1284]).
 - spark: Add `4.0.1` ([#1286]).
 - spark-connect-client: Add `4.0.1` ([#1286]).
+- trino/trino-storage-connector: Add `477` ([#1285]).
 
 ### Changed
 
@@ -35,6 +36,7 @@ All notable changes to this project will be documented in this file.
 - airflow: Bump uvicorn dependency to `0.37.0` ([#1264]).
 - druid: Deprecate `33.0.0` ([#1263]).
 - opa: Deprecate `1.4.2` ([#1279]).
+- trino-cli: Bump to 477 ([#1285]).
 
 ### Removed
 
@@ -48,6 +50,7 @@ All notable changes to this project will be documented in this file.
 - kafka: Remove `3.9.0` ([#1283]).
 - spark: Remove `4.0.0` ([#1286]).
 - spark-connect-client: Remove `4.0.0` ([#1286]).
+- trino/trino-storage-conector: Remove `470` ([#1285]).
 
 [#1207]: https://github.com/stackabletech/docker-images/pull/1207
 [#1215]: https://github.com/stackabletech/docker-images/pull/1215
@@ -70,6 +73,7 @@ All notable changes to this project will be documented in this file.
 [#1283]: https://github.com/stackabletech/docker-images/pull/1283
 [#1280]: https://github.com/stackabletech/docker-images/pull/1280
 [#1284]: https://github.com/stackabletech/docker-images/pull/1284
+[#1285]: https://github.com/stackabletech/docker-images/pull/1285
 [#1286]: https://github.com/stackabletech/docker-images/pull/1286
 
 ## [25.7.0] - 2025-07-23

rust/patchable/README.md

@@ -135,7 +135,7 @@ cargo patchable checkout druid 26.0.0
 
 # Tell Patchable about the new version 28.0.0, which can be fetched from
 # https://github.com/apache/druid.git, and has the tag druid-28.0.0
-cargo patchable init druid 28.0.0 --upstream https://github.com/apache/druid.git --base druid-28.0.0
+cargo patchable init version druid 28.0.0 --upstream https://github.com/apache/druid.git --base druid-28.0.0
 
 # Create and go to the worktree for the new version
 pushd $(cargo patchable checkout druid 28.0.0)

trino-cli/Dockerfile

@@ -29,8 +29,9 @@ COPY --chown=${STACKABLE_USER_UID}:0 trino-cli/licenses /licenses
 WORKDIR /stackable/trino-cli
 
 RUN <<EOF
-curl -O "https://repo.stackable.tech/repository/packages/trino-cli/trino-cli-${PRODUCT_VERSION}-executable.jar"
-ln -s "trino-cli-${PRODUCT_VERSION}-executable.jar" trino-cli-executable.jar
+curl -O "https://repo.stackable.tech/repository/packages/trino-cli/trino-cli-${PRODUCT_VERSION}"
+chmod +x "trino-cli-${PRODUCT_VERSION}"
+ln -s "trino-cli-${PRODUCT_VERSION}" trino-cli
 
 # All files and folders owned by root group to support running as arbitrary users.
 # This is best practice as all container users will belong to the root group (0).
@@ -46,4 +47,4 @@ EOF
 # ----------------------------------------
 
 USER ${STACKABLE_USER_UID}
-ENTRYPOINT ["java", "-jar", "/stackable/trino-cli/trino-cli-executable.jar"]
+ENTRYPOINT ["/stackable/trino-cli/trino-cli"]

trino-cli/boil-config.toml

@@ -1,2 +1,2 @@
-[versions."476".local-images]
+[versions."477".local-images]
 java-base = "24"

trino-cli/upload_new_trino_version.sh

@@ -31,19 +31,16 @@ trap cleanup EXIT
 
 cd "$WORK_DIR" || exit
 
-bin_file=trino-cli-${VERSION}-executable.jar
-
-echo "Downloading Trino (this can take a while, it is intentionally downloading from a slow mirror that contains all old versions)"
-curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}"
-curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}.asc"
-curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}.sha1"
-
-# It is probably redundant to check both the checksum and the signature but it's cheap and why not
-echo "Validating SHA1 Checksum"
-if ! (sha1sum "${bin_file}" | cut -d " " -f 1 | diff -Z - "${bin_file}.sha1"); then
-  echo "ERROR: The SHA1 sum does not match"
-  exit 1
-fi
+echo "Downloading Trino"
+# Since Trino version 477, the CLI is only available as a GitHub release and not on Maven repository anymore.
+curl --fail -LO --progress-bar "https://github.com/trinodb/trino/releases/download/${VERSION}/trino-cli-${VERSION}"
+
+# The GitHub releases don't provide SHA1 checksums. That's why we currently don't validate the checksum.
+# echo "Validating SHA1 Checksum"
+# if ! (sha1sum "${bin_file}" | cut -d " " -f 1 | diff -Z - "${bin_file}.sha1"); then
+#   echo "ERROR: The SHA1 sum does not match"
+#   exit 1
+# fi
 
 # echo "Adding pinned public key for signature"
 # # We lock the public key here until trino has a better workflow for signing
@@ -89,9 +86,7 @@ fi
 
 echo "Uploading everything to Nexus"
 EXIT_STATUS=0
-curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "${bin_file}" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
-curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "${bin_file}.asc" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
-curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "${bin_file}.sha1" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
+curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "trino-cli-${VERSION}" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
 
 if [ $EXIT_STATUS -ne 0 ]; then
   echo "ERROR: Upload failed"

trino/boil-config.toml

@@ -6,18 +6,18 @@ java-base = "22"
 [versions."451".build-arguments]
 jmx-exporter-version = "1.3.0"
 
-[versions."470".local-images]
-java-base = "23"
-"trino/trino" = "470"
-"trino/storage-connector" = "470"
-
-[versions."470".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"
+"trino/storage-connector" = "477"
+
+[versions."477".build-arguments]
+jmx-exporter-version = "1.3.0"

trino/storage-connector/boil-config.toml

@@ -2,10 +2,10 @@
 "trino/trino" = "451"
 java-devel = "22"
 
-[versions."470".local-images]
-"trino/trino" = "470"
-java-devel = "23"
-
 [versions."476".local-images]
 "trino/trino" = "476"
 java-devel = "24"
+
+[versions."477".local-images]
+"trino/trino" = "477"
+java-devel = "24"

trino/storage-connector/stackable/patches/470/0001-Add-CycloneDX-plugin.patch → trino/storage-connector/stackable/patches/477/0001-Add-CycloneDX-plugin.patch

@@ -1,4 +1,4 @@
-From 3c2f4038b72ac3b62bc12c89d40d643a87796ee2 Mon Sep 17 00:00:00 2001
+From 1d1c65b91212273e7f016ee45705ff3bf766bc08 Mon Sep 17 00:00:00 2001
 From: Lukas Voetmand <lukas.voetmand@stackable.tech>
 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 ddd620e..62e60b5 100644
+index bc0bfe6..fe5443e 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -545,6 +545,24 @@
+@@ -605,6 +605,24 @@
                      </dependency>
                  </dependencies>
              </plugin>

trino/storage-connector/stackable/patches/470/patchable.toml → trino/storage-connector/stackable/patches/477/patchable.toml

@@ -1,2 +1,2 @@
-base = "1b25d617940f14a844a43ee34aa705f7d11fbaf9"
 mirror = "https://github.com/stackabletech/trino-storage.git"
+base = "d3115d74556b240a38ee6fe2e0374f95bc037a86"

trino/trino/boil-config.toml

@@ -1,8 +1,8 @@
 [versions."451".local-images]
 java-devel = "22"
 
-[versions."470".local-images]
-java-devel = "23"
-
 [versions."476".local-images]
 java-devel = "24"
+
+[versions."477".local-images]
+java-devel = "24"

trino/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch → trino/trino/stackable/patches/477/0001-Add-CycloneDX-plugin.patch

@@ -1,4 +1,4 @@
-From 88bcb8d5ff689504f112b8b149a282a01e6b4212 Mon Sep 17 00:00:00 2001
+From 4a1b94832a203be4b873f884d5c85ee4cbd809b7 Mon Sep 17 00:00:00 2001
 From: Lukas Voetmand <lukas.voetmand@stackable.tech>
 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 a1604d5ebe..3f9f794504 100644
+index be96a97de9..a4ace8ffd7 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -2814,6 +2814,24 @@
+@@ -2853,6 +2853,24 @@
                      </excludes>
                  </configuration>
              </plugin>

trino/trino/stackable/patches/470/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch → trino/trino/stackable/patches/477/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch

@@ -1,6 +1,6 @@
-From 1ec0bcdafe9f74f37b6e791e3df6b552ba748538 Mon Sep 17 00:00:00 2001
+From 5800f14ed19ffaafb7286b5b17639a5df806c1c6 Mon Sep 17 00:00:00 2001
 From: dervoeti <lukas.krug@stackable.tech>
-Date: Wed, 18 Jun 2025 15:22:49 +0200
+Date: Wed, 18 Jun 2025 14:05:10 +0200
 Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86
  systems requires glibc 2.35, as of 2025-06-18 our UBI image comes with glibc
  2.34. This patch can likely be removed once we ship a newer version of glibc.
@@ -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 d097a1e22f..98c7516af1 100644
+index 471111f196..2c9eb56566 100644
 --- a/core/trino-web-ui/pom.xml
 +++ b/core/trino-web-ui/pom.xml
-@@ -103,28 +103,6 @@
+@@ -104,28 +104,6 @@
                              <workingDirectory>src/main/resources/webapp/src</workingDirectory>
                          </configuration>
                      </execution>

trino/trino/stackable/patches/470/patchable.toml → trino/trino/stackable/patches/477/patchable.toml

@@ -1,2 +1,2 @@
-base = "05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf"
 mirror = "https://github.com/stackabletech/trino.git"
+base = "aec2d2a4f0f57a0a0c9d4aee3a1dd59fcb513438"