Skip to content

Commit c4e1d48

Browse files
authored
Fix Spark 3.4 Docker image building (#5665)
1 parent 13b5031 commit c4e1d48

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

bin/build-kubernetes-images.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
if [[ "$#" -ne 1 ]] || [[ "$1" != "scala" && "$1" != "python" && "$1" != "r" && "$1" != "external-backend" ]]; then
44
echo "This script expects exactly one argument which specifies type of image to be build."
55
echo "The possible values are: scala, r, python, external-backend"
6-
exit -1
6+
exit 1
77
fi
88

9+
set -e # fail on error
910

1011
# Current dir
1112
TOPDIR=$(cd "$(dirname "$0")/.." || exit; pwd)

ci/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ task createDockerfile(type: Dockerfile, dependsOn: copyFiles) {
7979
if (version.startsWith("3.0") || version.startsWith("3.1")) {
8080
runCommand "sed -i 's/\\(apt-key[^)]*\\)/apt-key adv --keyserver keyserver.ubuntu.com --recv-key '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7'/g' ${sparkPath}/kubernetes/dockerfiles/spark/bindings/R/Dockerfile"
8181
}
82+
if (version > "3.4") { //downgrade back to openjdk as we do not support JDK 17 (yet)
83+
runCommand "sed -i 's/eclipse-temurin/openjdk/g' ${sparkPath}/kubernetes/dockerfiles/spark/Dockerfile"
84+
}
8285
def first = version.split("\\.")[0]
8386
def second = version.split("\\.")[1]
8487
environmentVariable("SPARK_HOME_${first}_${second}", sparkPath)

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ databricksTestSinceSpark=2.4
3636
spotlessModern=true
3737
testH2OBranch=rel-3.42.0
3838
makeBooklet=false
39-
testingBaseImage="harbor.h2o.ai/opsh2oai/h2o-3-hadoop-cdh-6.3:84"
39+
testingBaseImage=harbor.h2o.ai/opsh2oai/h2o-3-hadoop-cdh-6.3:84

0 commit comments

Comments
 (0)