Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[GH-5669] Fix Spark 3.4 Docker image building #5665

Merged
merged 2 commits into from
Oct 10, 2023
Merged

[GH-5669] Fix Spark 3.4 Docker image building #5665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baea699
Fix Spark 3.4 Docker image building
krasinski Sep 25, 2023
68d5103
Merge branch 'master' into fix-spark-3-4-docker-image-build
krasinski Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bin/build-kubernetes-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
if [[ "$#" -ne 1 ]] || [[ "$1" != "scala" && "$1" != "python" && "$1" != "r" && "$1" != "external-backend" ]]; then
echo "This script expects exactly one argument which specifies type of image to be build."
echo "The possible values are: scala, r, python, external-backend"
exit -1
exit 1
fi

set -e # fail on error

# Current dir
TOPDIR=$(cd "$(dirname "$0")/.." || exit; pwd)
Expand Down
3 changes: 3 additions & 0 deletions ci/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ task createDockerfile(type: Dockerfile, dependsOn: copyFiles) {
if (version.startsWith("3.0") || version.startsWith("3.1")) {
runCommand "sed -i 's/\\(apt-key[^)]*\\)/apt-key adv --keyserver keyserver.ubuntu.com --recv-key '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7'/g' ${sparkPath}/kubernetes/dockerfiles/spark/bindings/R/Dockerfile"
}
if (version > "3.4") { //downgrade back to openjdk as we do not support JDK 17 (yet)
runCommand "sed -i 's/eclipse-temurin/openjdk/g' ${sparkPath}/kubernetes/dockerfiles/spark/Dockerfile"
}
def first = version.split("\\.")[0]
def second = version.split("\\.")[1]
environmentVariable("SPARK_HOME_${first}_${second}", sparkPath)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ databricksTestSinceSpark=2.4
spotlessModern=true
testH2OBranch=rel-3.42.0
makeBooklet=false
testingBaseImage="harbor.h2o.ai/opsh2oai/h2o-3-hadoop-cdh-6.3:84"
testingBaseImage=harbor.h2o.ai/opsh2oai/h2o-3-hadoop-cdh-6.3:84
Loading