Skip to content

Commit 4a3d6b6

Browse files
Techassimaltesander
Techassi
and
maltesander
authored
chore(trino): Update images for 25.11.0 (#1285)
* chore(trino): Add version 477 * chore(trino/storage-connector): Add version 477 * chore(trino): Remove version 470 * chore(trino/storage-connector): Remove version 470 * docs(patchable): Fix init command * chore(trino-cli): Bump version to 477 * chore: Apply suggestion Co-authored-by: Malte Sander <[email protected]> --------- Co-authored-by: Malte Sander <[email protected]>
1 parent 2cd1c85 commit 4a3d6b6

File tree

13 files changed

+48
-48
lines changed

13 files changed

+48
-48
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
2323
- superset: Add `4.1.4` ([#1284]).
2424
- spark: Add `4.0.1` ([#1286]).
2525
- spark-connect-client: Add `4.0.1` ([#1286]).
26+
- trino/trino-storage-connector: Add `477` ([#1285]).
2627

2728
### Changed
2829

@@ -35,6 +36,7 @@ All notable changes to this project will be documented in this file.
3536
- airflow: Bump uvicorn dependency to `0.37.0` ([#1264]).
3637
- druid: Deprecate `33.0.0` ([#1263]).
3738
- opa: Deprecate `1.4.2` ([#1279]).
39+
- trino-cli: Bump to 477 ([#1285]).
3840

3941
### Removed
4042

@@ -48,6 +50,7 @@ All notable changes to this project will be documented in this file.
4850
- kafka: Remove `3.9.0` ([#1283]).
4951
- spark: Remove `4.0.0` ([#1286]).
5052
- spark-connect-client: Remove `4.0.0` ([#1286]).
53+
- trino/trino-storage-conector: Remove `470` ([#1285]).
5154

5255
[#1207]: https://github.com/stackabletech/docker-images/pull/1207
5356
[#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.
7073
[#1283]: https://github.com/stackabletech/docker-images/pull/1283
7174
[#1280]: https://github.com/stackabletech/docker-images/pull/1280
7275
[#1284]: https://github.com/stackabletech/docker-images/pull/1284
76+
[#1285]: https://github.com/stackabletech/docker-images/pull/1285
7377
[#1286]: https://github.com/stackabletech/docker-images/pull/1286
7478

7579
## [25.7.0] - 2025-07-23

‎rust/patchable/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ cargo patchable checkout druid 26.0.0
135135

136136
# Tell Patchable about the new version 28.0.0, which can be fetched from
137137
# https://github.com/apache/druid.git, and has the tag druid-28.0.0
138-
cargo patchable init druid 28.0.0 --upstream https://github.com/apache/druid.git --base druid-28.0.0
138+
cargo patchable init version druid 28.0.0 --upstream https://github.com/apache/druid.git --base druid-28.0.0
139139

140140
# Create and go to the worktree for the new version
141141
pushd $(cargo patchable checkout druid 28.0.0)

‎trino-cli/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ COPY --chown=${STACKABLE_USER_UID}:0 trino-cli/licenses /licenses
2929
WORKDIR /stackable/trino-cli
3030

3131
RUN <<EOF
32-
curl -O "https://repo.stackable.tech/repository/packages/trino-cli/trino-cli-${PRODUCT_VERSION}-executable.jar"
33-
ln -s "trino-cli-${PRODUCT_VERSION}-executable.jar" trino-cli-executable.jar
32+
curl -O "https://repo.stackable.tech/repository/packages/trino-cli/trino-cli-${PRODUCT_VERSION}"
33+
chmod +x "trino-cli-${PRODUCT_VERSION}"
34+
ln -s "trino-cli-${PRODUCT_VERSION}" trino-cli
3435

3536
# All files and folders owned by root group to support running as arbitrary users.
3637
# This is best practice as all container users will belong to the root group (0).
@@ -46,4 +47,4 @@ EOF
4647
# ----------------------------------------
4748

4849
USER ${STACKABLE_USER_UID}
49-
ENTRYPOINT ["java", "-jar", "/stackable/trino-cli/trino-cli-executable.jar"]
50+
ENTRYPOINT ["/stackable/trino-cli/trino-cli"]

‎trino-cli/boil-config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
[versions."476".local-images]
1+
[versions."477".local-images]
22
java-base = "24"

‎trino-cli/upload_new_trino_version.sh‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,16 @@ trap cleanup EXIT
3131

3232
cd "$WORK_DIR" || exit
3333

34-
bin_file=trino-cli-${VERSION}-executable.jar
35-
36-
echo "Downloading Trino (this can take a while, it is intentionally downloading from a slow mirror that contains all old versions)"
37-
curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}"
38-
curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}.asc"
39-
curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}.sha1"
40-
41-
# It is probably redundant to check both the checksum and the signature but it's cheap and why not
42-
echo "Validating SHA1 Checksum"
43-
if ! (sha1sum "${bin_file}" | cut -d " " -f 1 | diff -Z - "${bin_file}.sha1"); then
44-
echo "ERROR: The SHA1 sum does not match"
45-
exit 1
46-
fi
34+
echo "Downloading Trino"
35+
# Since Trino version 477, the CLI is only available as a GitHub release and not on Maven repository anymore.
36+
curl --fail -LO --progress-bar "https://github.com/trinodb/trino/releases/download/${VERSION}/trino-cli-${VERSION}"
37+
38+
# The GitHub releases don't provide SHA1 checksums. That's why we currently don't validate the checksum.
39+
# echo "Validating SHA1 Checksum"
40+
# if ! (sha1sum "${bin_file}" | cut -d " " -f 1 | diff -Z - "${bin_file}.sha1"); then
41+
# echo "ERROR: The SHA1 sum does not match"
42+
# exit 1
43+
# fi
4744

4845
# echo "Adding pinned public key for signature"
4946
# # We lock the public key here until trino has a better workflow for signing
@@ -89,9 +86,7 @@ fi
8986

9087
echo "Uploading everything to Nexus"
9188
EXIT_STATUS=0
92-
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=$?
93-
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=$?
94-
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=$?
89+
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=$?
9590

9691
if [ $EXIT_STATUS -ne 0 ]; then
9792
echo "ERROR: Upload failed"

‎trino/boil-config.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ java-base = "22"
66
[versions."451".build-arguments]
77
jmx-exporter-version = "1.3.0"
88

9-
[versions."470".local-images]
10-
java-base = "23"
11-
"trino/trino" = "470"
12-
"trino/storage-connector" = "470"
13-
14-
[versions."470".build-arguments]
15-
jmx-exporter-version = "1.3.0"
16-
179
[versions."476".local-images]
1810
java-base = "24"
1911
"trino/trino" = "476"
2012
"trino/storage-connector" = "476"
2113

2214
[versions."476".build-arguments]
2315
jmx-exporter-version = "1.3.0"
16+
17+
[versions."477".local-images]
18+
java-base = "24"
19+
"trino/trino" = "477"
20+
"trino/storage-connector" = "477"
21+
22+
[versions."477".build-arguments]
23+
jmx-exporter-version = "1.3.0"

‎trino/storage-connector/boil-config.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"trino/trino" = "451"
33
java-devel = "22"
44

5-
[versions."470".local-images]
6-
"trino/trino" = "470"
7-
java-devel = "23"
8-
95
[versions."476".local-images]
106
"trino/trino" = "476"
117
java-devel = "24"
8+
9+
[versions."477".local-images]
10+
"trino/trino" = "477"
11+
java-devel = "24"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3c2f4038b72ac3b62bc12c89d40d643a87796ee2 Mon Sep 17 00:00:00 2001
1+
From 1d1c65b91212273e7f016ee45705ff3bf766bc08 Mon Sep 17 00:00:00 2001
22
From: Lukas Voetmand <[email protected]>
33
Date: Fri, 6 Sep 2024 17:53:52 +0200
44
Subject: Add CycloneDX plugin
@@ -8,10 +8,10 @@ Subject: Add CycloneDX plugin
88
1 file changed, 18 insertions(+)
99

1010
diff --git a/pom.xml b/pom.xml
11-
index ddd620e..62e60b5 100644
11+
index bc0bfe6..fe5443e 100644
1212
--- a/pom.xml
1313
+++ b/pom.xml
14-
@@ -545,6 +545,24 @@
14+
@@ -605,6 +605,24 @@
1515
</dependency>
1616
</dependencies>
1717
</plugin>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
base = "1b25d617940f14a844a43ee34aa705f7d11fbaf9"
21
mirror = "https://github.com/stackabletech/trino-storage.git"
2+
base = "d3115d74556b240a38ee6fe2e0374f95bc037a86"

‎trino/trino/boil-config.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions."451".local-images]
22
java-devel = "22"
33

4-
[versions."470".local-images]
5-
java-devel = "23"
6-
74
[versions."476".local-images]
85
java-devel = "24"
6+
7+
[versions."477".local-images]
8+
java-devel = "24"

0 commit comments

Comments
 (0)