Skip to content

Commit 07f0867

Browse files
committed
Added docker build arguments
1 parent c11f5f9 commit 07f0867

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

integration-test/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/docker/SparkDockerImageBuilder.scala

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
package org.apache.spark.deploy.k8s.integrationtest.docker
1818

1919
import java.net.URI
20+
import java.net.URLEncoder
2021
import java.nio.file.Paths
2122

22-
import com.spotify.docker.client.{DefaultDockerClient, DockerCertificates, LoggingBuildHandler}
23+
import com.spotify.docker.client.{DockerClient, DefaultDockerClient, DockerCertificates, LoggingBuildHandler}
2324
import org.apache.http.client.utils.URIBuilder
2425
import org.scalatest.concurrent.{Eventually, PatienceConfiguration}
2526
import org.scalatest.time.{Minutes, Seconds, Span}
@@ -61,17 +62,19 @@ private[spark] class SparkDockerImageBuilder
6162

6263
def buildSparkDockerImages(): Unit = {
6364
Eventually.eventually(TIMEOUT, INTERVAL) { dockerClient.ping() }
64-
buildImage("spark-base", BASE_DOCKER_FILE)
65-
buildImage("spark-driver", DRIVER_DOCKER_FILE)
66-
buildImage("spark-executor", EXECUTOR_DOCKER_FILE)
65+
buildImage("spark-base", BASE_DOCKER_FILE,
66+
"{\"spark_jars\":\"jars\",\"img_path\":\"kubernetes/dockerfiles\"}")
67+
buildImage("spark-driver", DRIVER_DOCKER_FILE, "{\"base_image\":\"spark-base\"}")
68+
buildImage("spark-executor", EXECUTOR_DOCKER_FILE, "{\"base_image\":\"spark-base\"}")
6769
}
6870

69-
private def buildImage(name: String, dockerFile: String): Unit = {
71+
private def buildImage(name: String, dockerFile: String, buildArgs: String): Unit = {
7072
dockerClient.build(
7173
DOCKER_BUILD_PATH,
7274
name,
7375
dockerFile,
74-
new LoggingBuildHandler())
76+
new LoggingBuildHandler(),
77+
DockerClient.BuildParam.create("buildargs", URLEncoder.encode(buildArgs, "UTF-8")))
7578
logInfo(s"Built $name docker image")
7679
}
7780
}

0 commit comments

Comments
 (0)