Skip to content

Commit 6b8b7af

Browse files
authored
Fix Trino build by not building JMX Exporter from source anymore. (#933)
This is a temporary fix and we want to get back to building it from source in the future as soon as we have our proper patch handling process in place.
1 parent e00f661 commit 6b8b7af

File tree

1 file changed

+5
-33
lines changed

1 file changed

+5
-33
lines changed

trino/Dockerfile

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ mvn versions:set -DnewVersion=${STORAGE_CONNECTOR}
3636
./mvnw package -DskipTests -Dmaven.gitcommitid.skip=true
3737
EOF
3838

39-
FROM stackable/image/java-devel AS builder
39+
FROM stackable/image/java-devel AS trino-builder
4040

4141
ARG PRODUCT
4242
ARG STORAGE_CONNECTOR
@@ -113,36 +113,6 @@ COPY shared/log4shell_scanner /bin/log4shell_scanner
113113
RUN /bin/log4shell_scanner s /stackable/trino-server-${PRODUCT}
114114
# ===
115115

116-
FROM stackable/image/java-devel AS jmx-exporter-builder
117-
118-
ARG JMX_EXPORTER
119-
ARG STACKABLE_USER_UID
120-
121-
RUN <<EOF
122-
microdnf update
123-
124-
# patch: Required for the apply-patches.sh script
125-
microdnf install \
126-
patch
127-
128-
microdnf clean all
129-
rm -rf /var/cache/yum
130-
EOF
131-
132-
WORKDIR /stackable
133-
134-
COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/patches/apply_patches.sh /stackable/jmx_prometheus-${JMX_EXPORTER}-src/patches/apply_patches.sh
135-
COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/patches/jmx-exporter/${JMX_EXPORTER} /stackable/jmx_prometheus-${JMX_EXPORTER}-src/patches/${JMX_EXPORTER}
136-
137-
RUN curl "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus-${JMX_EXPORTER}-src.tar.gz" | tar -xzC .
138-
# adding a hadolint ignore for SC2215, due to https://github.com/hadolint/hadolint/issues/980
139-
# hadolint ignore=SC2215
140-
RUN --mount=type=cache,id=maven-${JMX_EXPORTER},target=/root/.m2/repository <<EOF
141-
cd jmx_prometheus-${JMX_EXPORTER}-src
142-
./patches/apply_patches.sh ${JMX_EXPORTER}
143-
mvn package
144-
EOF
145-
146116
FROM stackable/image/java-base
147117

148118
ARG PRODUCT
@@ -173,11 +143,13 @@ WORKDIR /stackable
173143
COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable /stackable
174144
COPY --chown=${STACKABLE_USER_UID}:0 trino/licenses /licenses
175145

176-
COPY --from=builder /stackable/trino-server-${PRODUCT} /stackable/trino-server-${PRODUCT}
177-
COPY --from=jmx-exporter-builder /stackable/jmx_prometheus-${JMX_EXPORTER}-src/jmx_prometheus_javaagent/target/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar
146+
COPY --from=trino-builder /stackable/trino-server-${PRODUCT} /stackable/trino-server-${PRODUCT}
178147

179148
RUN <<EOF
180149
ln -s /stackable/trino-server-${PRODUCT} /stackable/trino-server
150+
151+
curl --fail https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar -o /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar
152+
chmod +x /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar
181153
ln -s /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar /stackable/jmx/jmx_prometheus_javaagent.jar
182154

183155
# All files and folders owned by root group to support running as arbitrary users.

0 commit comments

Comments
 (0)