Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Builds some docker images
  • Loading branch information
kimoonkim committed Dec 16, 2017
commit 74c158b703947fc3043f5fcc96bc7ddba4ec807f
6 changes: 3 additions & 3 deletions integration-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<version>1.4.0</version>
<executions>
<execution>
<id>rename-spark-distro-output-dir</id>
<id>unpack-spark-distro</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
Expand All @@ -117,7 +117,7 @@
<executable>/bin/sh</executable>
<arguments>
<argument>-c</argument>
<argument>mkdir spark-distro-unpacked; cd spark-distro-unpacked; tar xfz ${spark-distro-tgz}; mv * ../docker</argument>
<argument>mkdir spark-distro-tmp; cd spark-distro-tmp; tar xfz ${spark-distro-tgz}; mv * ../spark-distro; cd ..; rm -rf spark-distro-tmp</argument>
</arguments>
</configuration>
</execution>
Expand All @@ -134,7 +134,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/docker/dockerfiles</outputDirectory>
<outputDirectory>${project.build.directory}/spark-distro/dockerfiles</outputDirectory>
<resources>
<resource>
<directory>src/main/docker</directory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.apache.spark.deploy.k8s.integrationtest.Logging
private[spark] class SparkDockerImageBuilder
(private val dockerEnv: Map[String, String]) extends Logging{

private val DOCKER_BUILD_PATH = Paths.get("target", "docker")
private val DOCKER_BUILD_PATH = Paths.get("target", "spark-distro")
// Dockerfile paths must be relative to the build path.
private val BASE_DOCKER_FILE = "dockerfiles/spark-base/Dockerfile"
private val DRIVER_DOCKER_FILE = "dockerfiles/driver/Dockerfile"
Expand Down Expand Up @@ -73,5 +73,6 @@ private[spark] class SparkDockerImageBuilder
name,
dockerFile,
new LoggingBuildHandler())
logInfo(s"Built $name docker image")
}
}