Update launch script integration tests to work with Docker 1.12

Closes gh-6914 (I hope)
pull/7002/head
Andy Wilkinson 8 years ago
parent 04b261984e
commit 5a539ce381

@ -10,9 +10,10 @@ The setup that's required varies depending on your operating system.
=== Docker on OS X === Docker on OS X
Docker relies on Linux kernel features so the Docker Daemon must be run inside a Linux VM. The latest version of Docker runs as a native Mac application but isn't supported by
Following the https://docs.docker.com/engine/installation/mac/[OS X installation docker-java. This means that you should use Docker Toolbox. See the
instructions] to install Docker Toolbox which uses VirtualBox to host the required VM. https://docs.docker.com/engine/installation/mac/[OS X installation instructions] for
details.
=== Docker on Linux === Docker on Linux

@ -233,7 +233,7 @@ public class SysVinitLaunchScriptIT {
private DockerClient createClient() { private DockerClient createClient() {
DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder() DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder()
.build(); .withVersion("1.19").build();
DockerClient docker = DockerClientBuilder.getInstance(config) DockerClient docker = DockerClientBuilder.getInstance(config)
.withDockerCmdExecFactory(this.commandExecFactory).build(); .withDockerCmdExecFactory(this.commandExecFactory).build();
return docker; return docker;

Loading…
Cancel
Save