Skip to content

Commit 60b07d5

Browse files
authored
fix(spark-k8s): Use correct release and Python ARGs (#1256)
* fix(spark-k8s): Use RELEASE_VERSION instead of RELEASE * fix(spark-k8s): Use PYTHON_VERSION instead of PYTHON
1 parent 24c506e commit 60b07d5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

spark-k8s/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ if [[ "${PRODUCT_VERSION}" == 4* ]]; then
6868
# Create this empty directory so that following COPY layers succeed.
6969
mkdir -p /stackable/spark/jars
7070
# Create a dummy tarball to satisfy the build process for Spark 3.
71-
touch hbase-connector-${HBASE_CONNECTOR_VERSION}-stackable${RELEASE}-src.tar.gz
71+
touch hbase-connector-${HBASE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz
7272
exit 0
7373
fi
7474

@@ -301,7 +301,7 @@ EOF
301301
FROM local-image/java-base AS final
302302

303303
ARG PRODUCT_VERSION
304-
ARG PYTHON
304+
ARG PYTHON_VERSION
305305
ARG RELEASE_VERSION
306306
ARG JMX_EXPORTER_VERSION
307307
ARG HBASE_CONNECTOR_VERSION
@@ -347,15 +347,15 @@ microdnf install --nodocs \
347347
gzip \
348348
hostname \
349349
procps \
350-
"python${PYTHON}" \
351-
"python${PYTHON}-pip" \
350+
"python${PYTHON_VERSION}" \
351+
"python${PYTHON_VERSION}-pip" \
352352
zip \
353353
"temurin-${JAVA_VERSION}-jdk"
354354
microdnf clean all
355355
rm -rf /var/cache/yum
356356

357-
ln -s /usr/bin/python${PYTHON} /usr/bin/python
358-
ln -s /usr/bin/pip-${PYTHON} /usr/bin/pip
357+
ln -s /usr/bin/python${PYTHON_VERSION} /usr/bin/python
358+
ln -s /usr/bin/pip-${PYTHON_VERSION} /usr/bin/pip
359359

360360
# Symlink example jar, so that we can easily use it in tests
361361
ln -s /stackable/spark/examples/jars/spark-examples_*.jar /stackable/spark/examples/jars/spark-examples.jar

0 commit comments

Comments
 (0)