From 11bcd59b7eeb499978833d2216fbb91d3b50f9dd Mon Sep 17 00:00:00 2001 From: Techassi Date: Mon, 15 Sep 2025 20:46:04 +0200 Subject: [PATCH 1/2] fix(spark-k8s): Use RELEASE_VERSION instead of RELEASE --- spark-k8s/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark-k8s/Dockerfile b/spark-k8s/Dockerfile index fd9b8e940..624a9abd3 100644 --- a/spark-k8s/Dockerfile +++ b/spark-k8s/Dockerfile @@ -68,7 +68,7 @@ if [[ "${PRODUCT_VERSION}" == 4* ]]; then # Create this empty directory so that following COPY layers succeed. mkdir -p /stackable/spark/jars # Create a dummy tarball to satisfy the build process for Spark 3. - touch hbase-connector-${HBASE_CONNECTOR_VERSION}-stackable${RELEASE}-src.tar.gz + touch hbase-connector-${HBASE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz exit 0 fi From 37823708c692befd7b00739a6179d0ab172da905 Mon Sep 17 00:00:00 2001 From: Techassi Date: Mon, 15 Sep 2025 21:58:03 +0200 Subject: [PATCH 2/2] fix(spark-k8s): Use PYTHON_VERSION instead of PYTHON --- spark-k8s/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spark-k8s/Dockerfile b/spark-k8s/Dockerfile index 624a9abd3..2ba8b3351 100644 --- a/spark-k8s/Dockerfile +++ b/spark-k8s/Dockerfile @@ -301,7 +301,7 @@ EOF FROM local-image/java-base AS final ARG PRODUCT_VERSION -ARG PYTHON +ARG PYTHON_VERSION ARG RELEASE_VERSION ARG JMX_EXPORTER_VERSION ARG HBASE_CONNECTOR_VERSION @@ -347,15 +347,15 @@ microdnf install --nodocs \ gzip \ hostname \ procps \ - "python${PYTHON}" \ - "python${PYTHON}-pip" \ + "python${PYTHON_VERSION}" \ + "python${PYTHON_VERSION}-pip" \ zip \ "temurin-${JAVA_VERSION}-jdk" microdnf clean all rm -rf /var/cache/yum -ln -s /usr/bin/python${PYTHON} /usr/bin/python -ln -s /usr/bin/pip-${PYTHON} /usr/bin/pip +ln -s /usr/bin/python${PYTHON_VERSION} /usr/bin/python +ln -s /usr/bin/pip-${PYTHON_VERSION} /usr/bin/pip # Symlink example jar, so that we can easily use it in tests ln -s /stackable/spark/examples/jars/spark-examples_*.jar /stackable/spark/examples/jars/spark-examples.jar