Skip to content

Commit 0cb11fe

Browse files
committed
remove log4shell check
1 parent b96184f commit 0cb11fe

File tree

1 file changed

+6
-25
lines changed

1 file changed

+6
-25
lines changed

spark-k8s/Dockerfile

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,12 @@ COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-source-builder \
189189
# 134.0 [ERROR] Detected Maven Version: 3.6.3 is not in the allowed range [3.8.8,)
190190
RUN export MAVEN_OPTS="-Xss64m -Xmx2g -XX:ReservedCodeCacheSize=1g" \
191191
&& ./dev/make-distribution.sh \
192-
-Dhadoop.version="$HADOOP" \
193-
-Dmaven.test.skip=true \
194-
-DskipTests \
195-
-P'hadoop-3' -Pkubernetes -Phive -Phive-thriftserver \
196-
--no-transfer-progress \
197-
--batch-mode
192+
-Dhadoop.version="$HADOOP" \
193+
-Dmaven.test.skip=true \
194+
-DskipTests \
195+
-P'hadoop-3' -Pkubernetes -Phive -Phive-thriftserver \
196+
--no-transfer-progress \
197+
--batch-mode
198198

199199
# <<< Build spark
200200

@@ -251,25 +251,6 @@ WORKDIR /stackable/jmx
251251

252252
RUN curl -O "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
253253

254-
# ===
255-
# Mitigation for CVE-2021-44228 (Log4Shell)
256-
#
257-
# For earlier versions this script removes the .class file that contains the
258-
# vulnerable code.
259-
# TODO: This can be restricted to target only versions which do not honor the environment
260-
# varible that has been set above but this has not currently been implemented
261-
COPY shared/log4shell.sh /bin
262-
RUN /bin/log4shell.sh /stackable/spark-${PRODUCT}/dist
263-
264-
# Ensure no vulnerable files are left over
265-
# This will currently report vulnerable files being present, as it also alerts on
266-
# SocketNode.class, which we do not remove with our scripts.
267-
# Further investigation will be needed whether this should also be removed.
268-
COPY shared/log4shell_1.6.1-log4shell_Linux_x86_64 /bin/log4shell_scanner_x86_64
269-
COPY shared/log4shell_1.6.1-log4shell_Linux_aarch64 /bin/log4shell_scanner_aarch64
270-
COPY shared/log4shell_scanner /bin/log4shell_scanner
271-
RUN /bin/log4shell_scanner s /stackable/spark-${PRODUCT}/dist
272-
# ===
273254

274255
FROM stackable/image/java-base AS final
275256

0 commit comments

Comments
 (0)