Skip to content

Commit 49d11d4

Browse files
ckadnerJoshRosen
authored andcommitted
[SPARK-17803][TESTS] Upgrade docker-client dependency
[SPARK-17803: Docker integration tests don't run with "Docker for Mac"](https://issues.apache.org/jira/browse/SPARK-17803) ## What changes were proposed in this pull request? This PR upgrades the [docker-client](https://mvnrepository.com/artifact/com.spotify/docker-client) dependency from [3.6.6](https://mvnrepository.com/artifact/com.spotify/docker-client/3.6.6) to [5.0.2](https://mvnrepository.com/artifact/com.spotify/docker-client/5.0.2) to enable _Docker for Mac_ users to run the `docker-integration-tests` out of the box. The very latest docker-client version is [6.0.0](https://mvnrepository.com/artifact/com.spotify/docker-client/6.0.0) but that has one additional dependency and no usage yet. ## How was this patch tested? The code change was tested on Mac OS X Yosemite with both _Docker Toolbox_ as well as _Docker for Mac_ and on Linux Ubuntu 14.04. ``` $ build/mvn -Pyarn -Phadoop-2.6 -Dhadoop.version=2.6.0 -Phive -Phive-thriftserver -DskipTests clean package $ build/mvn -Pdocker-integration-tests -Pscala-2.11 -pl :spark-docker-integration-tests_2.11 clean compile test ``` Author: Christian Kadner <[email protected]> Closes apache#15378 from ckadner/SPARK-17803_Docker_for_Mac.
1 parent 9a48e60 commit 49d11d4

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import scala.collection.JavaConverters._
2424
import scala.util.control.NonFatal
2525

2626
import com.spotify.docker.client._
27+
import com.spotify.docker.client.exceptions.ImageNotFoundException
2728
import com.spotify.docker.client.messages.{ContainerConfig, HostConfig, PortBinding}
2829
import org.scalatest.BeforeAndAfterAll
2930
import org.scalatest.concurrent.Eventually

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@
744744
<dependency>
745745
<groupId>com.spotify</groupId>
746746
<artifactId>docker-client</artifactId>
747-
<version>3.6.6</version>
747+
<version>5.0.2</version>
748748
<scope>test</scope>
749749
<exclusions>
750750
<exclusion>

0 commit comments

Comments
 (0)