Skip to content

Commit 59b94a2

Browse files
authored
Add Trino 451 (#758)
1 parent c781aea commit 59b94a2

File tree

11 files changed

+34
-4
lines changed

11 files changed

+34
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ All notable changes to this project will be documented in this file.
2727
- stackable-base: Add [config-utils](https://github.com/stackabletech/config-utils) ([#706]).
2828
- omid: Include Apache Omid Examples to simplify testing ([#721]).
2929
- kafka: Add versions `3.6.2` and `3.7.1` ([#745]).
30+
- trino & trino-cli: Add version 451 ([#XXX]).
3031

3132
### Changed
3233

java-base/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ LABEL name="Stackable image for OpenJDK" \
1919
summary="The Stackable OpenJDK base image." \
2020
description="This image is the base image for all Stackable Java product images."
2121

22+
# We need to use EPEL, as openjdk 22 is not shipped with UBI9
23+
RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
24+
2225
RUN microdnf update && \
2326
microdnf install \
2427
# Obviously needed to run Java programs

java-base/versions.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@
1515
"product": "21",
1616
"vector": "0.39.0",
1717
},
18+
{
19+
"product": "22",
20+
"vector": "0.39.0",
21+
},
1822
]

java-devel/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ FROM stackable/image/stackable-base
77

88
ARG PRODUCT
99

10+
# We need to use EPEL, as openjdk 22 is not shipped with UBI9
11+
RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
12+
1013
# hadolint ignore=DL3041
1114
RUN microdnf update && \
1215
microdnf install -y \

java-devel/versions.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@
1515
"product": "21",
1616
"stackable-base": "1.0.0",
1717
},
18+
{
19+
"product": "22",
20+
"stackable-base": "1.0.0",
21+
},
1822
]

stackable-base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ RUN update-ca-trust && \
112112

113113
COPY --from=product-utils-builder --chown=stackable:stackable /config-utils/target/release/config-utils /stackable/config-utils
114114
COPY --from=product-utils-builder --chown=stackable:stackable /config-utils/config-utils.cdx.xml /stackable/config-utils.cdx.xml
115-
ENV PATH "${PATH}:/stackable"
115+
ENV PATH="${PATH}:/stackable"

trino-cli/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
FROM stackable/image/java-base
88

99
ARG PRODUCT
10+
ARG RELEASE
1011

1112
LABEL name="Trino CLI" \
1213
maintainer="info@stackable.tech" \

trino-cli/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# trino-cli
2+
3+
This image is only used in integration tests and demos.
4+
It's therefore ok if we only support a single version at a time.

trino-cli/versions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
versions = [
22
{
3-
"product": "442",
4-
"java-base": "21",
3+
"product": "451",
4+
"java-base": "22",
55
},
66
]

trino/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@ ARG STORAGE_CONNECTOR
5252
WORKDIR /stackable
5353

5454
RUN curl --fail -L "https://repo.stackable.tech/repository/packages/trino-server/trino-server-${PRODUCT}-src.tar.gz" | tar -xzC .
55+
5556
RUN --mount=type=cache,target=/root/.m2/repository cd "trino-server-${PRODUCT}-src" && \
56-
mvn package -DskipTests -Dmaven.gitcommitid.skip=true --projects="!docs,!core/trino-server-rpm" && \
57+
# We need to use ./mvnw instead of mvn to get a recent maven version (which is required to build Trino)
58+
./mvnw package -DskipTests -Dmaven.gitcommitid.skip=true --projects="!docs,!core/trino-server-rpm" && \
5759
# Delete the worst intermediate build products to free some space
5860
rm -r /stackable/trino-server-${PRODUCT}-src/plugin/*/target /stackable/trino-server-${PRODUCT}-src/core/trino-server/target/trino-server-${PRODUCT} && \
5961
# Extract from tarball to save space; the tarball deduplicates jars (replacing them with symlinks),

0 commit comments

Comments
 (0)