Skip to content

Added docker build arguments #18

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

Merged
merged 1 commit into from
Jan 6, 2018
Merged

Added docker build arguments #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 23 additions & 8 deletions ...st/scala/org/apache/spark/deploy/k8s/integrationtest/docker/SparkDockerImageBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
package org.apache.spark.deploy.k8s.integrationtest.docker

import java.net.URI
import java.net.URLEncoder
import java.nio.file.Paths

import com.spotify.docker.client.{DefaultDockerClient, DockerCertificates, LoggingBuildHandler}
import com.spotify.docker.client.{DockerClient, DefaultDockerClient, DockerCertificates, LoggingBuildHandler}
import org.apache.http.client.utils.URIBuilder
import org.scalatest.concurrent.{Eventually, PatienceConfiguration}
import org.scalatest.time.{Minutes, Seconds, Span}
Expand Down Expand Up @@ -61,17 +62,31 @@ private[spark] class SparkDockerImageBuilder

def buildSparkDockerImages(): Unit = {
Eventually.eventually(TIMEOUT, INTERVAL) { dockerClient.ping() }
buildImage("spark-base", BASE_DOCKER_FILE)
buildImage("spark-base", BASE_DOCKER_FILE,
Some("{\"spark_jars\":\"jars\",\"img_path\":\"kubernetes/dockerfiles\"}"))
buildImage("spark-driver", DRIVER_DOCKER_FILE)
buildImage("spark-executor", EXECUTOR_DOCKER_FILE)
}

private def buildImage(name: String, dockerFile: String): Unit = {
dockerClient.build(
DOCKER_BUILD_PATH,
name,
dockerFile,
new LoggingBuildHandler())
private def buildImage(
name: String,
dockerFile: String,
buildArgs: Option[String] = None): Unit = {
if (buildArgs.nonEmpty) {
dockerClient.build(
DOCKER_BUILD_PATH,
name,
dockerFile,
new LoggingBuildHandler(),
DockerClient.BuildParam.create("buildargs", URLEncoder.encode(buildArgs.get, "UTF-8")))
} else {
dockerClient.build(
DOCKER_BUILD_PATH,
name,
dockerFile,
new LoggingBuildHandler())
}

logInfo(s"Built $name docker image")
}
}