File tree Expand file tree Collapse file tree 11 files changed +34
-4
lines changed Expand file tree Collapse file tree 11 files changed +34
-4
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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+
2225RUN microdnf update && \
2326 microdnf install \
2427 # Obviously needed to run Java programs
Original file line number Diff line number Diff line change 1515 "product" : "21" ,
1616 "vector" : "0.39.0" ,
1717 },
18+ {
19+ "product" : "22" ,
20+ "vector" : "0.39.0" ,
21+ },
1822]
Original file line number Diff line number Diff line change @@ -7,6 +7,9 @@ FROM stackable/image/stackable-base
77
88ARG 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
1114RUN microdnf update && \
1215 microdnf install -y \
Original file line number Diff line number Diff line change 1515 "product" : "21" ,
1616 "stackable-base" : "1.0.0" ,
1717 },
18+ {
19+ "product" : "22" ,
20+ "stackable-base" : "1.0.0" ,
21+ },
1822]
Original file line number Diff line number Diff line change @@ -112,4 +112,4 @@ RUN update-ca-trust && \
112112
113113COPY --from=product-utils-builder --chown=stackable:stackable /config-utils/target/release/config-utils /stackable/config-utils
114114COPY --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"
Original file line number Diff line number Diff line change 77FROM stackable/image/java-base
88
99ARG PRODUCT
10+ ARG RELEASE
1011
1112LABEL name="Trino CLI" \
1213 maintainer="info@stackable.tech" \
Original file line number Diff line number Diff line change 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.
Original file line number Diff line number Diff line change 11versions = [
22 {
3- "product" : "442 " ,
4- "java-base" : "21 " ,
3+ "product" : "451 " ,
4+ "java-base" : "22 " ,
55 },
66]
Original file line number Diff line number Diff line change @@ -52,8 +52,10 @@ ARG STORAGE_CONNECTOR
5252WORKDIR /stackable
5353
5454RUN curl --fail -L "https://repo.stackable.tech/repository/packages/trino-server/trino-server-${PRODUCT}-src.tar.gz" | tar -xzC .
55+
5556RUN --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),
You can’t perform that action at this time.
0 commit comments