Skip to content

fix(trino): Correctly report Trino version #881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbernauer merged 3 commits into from
Sep 30, 2024
Merged

fix(trino): Correctly report Trino version #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ba2c0f
fix(trino): Correctly report Trino version
sbernauer Sep 30, 2024
48002af
Merge branch 'main' into fix/trino-version
sbernauer Sep 30, 2024
3ff7ffc
changelog
sbernauer Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ All notable changes to this project will be documented in this file.
### Fixed

- hbase: link to phoenix server jar ([#811]).
- trino: Correctly report Trino version ([#881]).

[#783]: https://github.com/stackabletech/docker-images/pull/783
[#797]: https://github.com/stackabletech/docker-images/pull/797
Expand All @@ -71,6 +72,7 @@ All notable changes to this project will be documented in this file.
[#877]: https://github.com/stackabletech/docker-images/pull/877
[#878]: https://github.com/stackabletech/docker-images/pull/878
[#879]: https://github.com/stackabletech/docker-images/pull/879
[#881]: https://github.com/stackabletech/docker-images/pull/881

## [24.7.0] - 2024-07-24

Expand Down
13 changes: 12 additions & 1 deletion trino/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,19 @@ COPY --chown=stackable:stackable trino/stackable/patches/${PRODUCT} /stackable/t
# hadolint ignore=SC2215
RUN --mount=type=cache,target=/root/.m2/repository cd "trino-server-${PRODUCT}-src" && \
./patches/apply_patches.sh ${PRODUCT} && \
# Trino is using something (git-commit-id-plugin in the past, maybe something else now) that is
# reading the Git history and searches for a tag to pull the version from. It sounds weird to me
# why someone would do that over just picking the version from the pom.xml, but they propably
# have their reasons. See e.g. https://github.com/trinodb/trino/discussions/18963.
# So we fake it till we make it and create a Git repo and the correct tag. The trino-operator
# smoke test checks that "select version()" is working.
git init && \
git config user.email "fake.commiter@stackable.tech" && \
git config user.name "Fake commiter" && \
git commit --allow-empty --message "Fake commit, so that we can create a tag" && \
git tag ${PRODUCT} && \
# We need to use ./mvnw instead of mvn to get a recent maven version (which is required to build Trino)
./mvnw package -DskipTests -Dmaven.gitcommitid.skip=true --projects="!docs,!core/trino-server-rpm" && \
./mvnw package -DskipTests --projects="!docs,!core/trino-server-rpm" && \
# Delete the worst intermediate build products to free some space
rm -r /stackable/trino-server-${PRODUCT}-src/plugin/*/target /stackable/trino-server-${PRODUCT}-src/core/trino-server/target/trino-server-${PRODUCT} && \
# Extract from tarball to save space; the tarball deduplicates jars (replacing them with symlinks),
Expand Down