@@ -12,6 +12,7 @@ ARG PRODUCT_VERSION
1212ARG RELEASE_VERSION
1313ARG STACKABLE_USER_UID
1414ARG PRECOMPILED_HADOOP_VERSION
15+ ARG PRECOMPILED_HADOOP_TS
1516# Reassign the arg to `HADOOP_VERSION` for better readability.
1617ENV HADOOP_VERSION=${PRECOMPILED_HADOOP_VERSION}
1718
@@ -54,7 +55,7 @@ tar -czf /stackable/hdfs-utils-${HDFS_UTILS_VERSION}-src.tar.gz .
5455mvn \
5556 clean package \
5657 -P hadoop-${HADOOP_VERSION} \
57- -Dhadoop.version=${HADOOP_VERSION}-stackable${RELEASE_VERSION } \
58+ -Dhadoop.version=${HADOOP_VERSION}-stackable${PRECOMPILED_HADOOP_TS } \
5859 -DskipTests \
5960 -Dmaven.javadoc.skip=true
6061
@@ -70,6 +71,7 @@ FROM local-image/java-base AS final
7071ARG PRODUCT_VERSION
7172ARG RELEASE_VERSION
7273ARG PRECOMPILED_HADOOP_VERSION
74+ ARG PRECOMPILED_HADOOP_TS
7375# Reassign the arg to `HADOOP_VERSION` for better readability.
7476ENV HADOOP_VERSION=${PRECOMPILED_HADOOP_VERSION}
7577ARG HDFS_UTILS_VERSION
@@ -88,10 +90,10 @@ LABEL \
8890 summary="The Stackable image for Apache Hadoop." \
8991 description="This image is deployed by the Stackable Operator for Apache Hadoop / HDFS."
9092
91- COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION } /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION }
93+ COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/hadoop-${HADOOP_VERSION}-stackable${PRECOMPILED_HADOOP_TS } /stackable/hadoop-${HADOOP_VERSION}-stackable${PRECOMPILED_HADOOP_TS }
9294COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/*-src.tar.gz /stackable
9395
94- COPY --chown=${STACKABLE_USER_UID}:0 --from=hdfs-utils-builder /stackable/hdfs-utils-${HDFS_UTILS_VERSION}.jar /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION }/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS_VERSION}.jar
96+ COPY --chown=${STACKABLE_USER_UID}:0 --from=hdfs-utils-builder /stackable/hdfs-utils-${HDFS_UTILS_VERSION}.jar /stackable/hadoop-${HADOOP_VERSION}-stackable${PRECOMPILED_HADOOP_TS }/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS_VERSION}.jar
9597COPY --chown=${STACKABLE_USER_UID}:0 --from=hdfs-utils-builder /stackable/hdfs-utils-${HDFS_UTILS_VERSION}-src.tar.gz /stackable
9698
9799COPY --chown=${STACKABLE_USER_UID}:0 hadoop/stackable/jmx /stackable/jmx
@@ -119,7 +121,7 @@ rm -rf /var/cache/yum
119121# It is so non-root users (as we are) can mount a FUSE device and let other users access it
120122echo "user_allow_other" > /etc/fuse.conf
121123
122- ln -s "/stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION }" /stackable/hadoop
124+ ln -s "/stackable/hadoop-${HADOOP_VERSION}-stackable${PRECOMPILED_HADOOP_TS }" /stackable/hadoop
123125
124126# async-profiler
125127ARCH="${TARGETARCH/amd64/x64}"
@@ -133,7 +135,7 @@ ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar" /sta
133135
134136# Set correct permissions and ownerships
135137chown --recursive ${STACKABLE_USER_UID}:0 /stackable/hadoop /stackable/jmx /stackable/async-profiler "/stackable/async-profiler-${ASYNC_PROFILER_VERSION}-${TARGETOS}-${ARCH}"
136- chmod --recursive g=u /stackable/jmx /stackable/async-profiler "/stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION }"
138+ chmod --recursive g=u /stackable/jmx /stackable/async-profiler "/stackable/hadoop-${HADOOP_VERSION}-stackable${PRECOMPILED_HADOOP_TS }"
137139
138140# Workaround for https://issues.apache.org/jira/browse/HADOOP-12845
139141# The problem is that our stackable-devel image does contain the openssl-devel package
0 commit comments