Skip to content

Commit 5a539ce

Browse files
committed
Update launch script integration tests to work with Docker 1.12
Closes gh-6914 (I hope)
1 parent 04b2619 commit 5a539ce

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ The setup that's required varies depending on your operating system.
1010

1111
=== Docker on OS X
1212

13-
Docker relies on Linux kernel features so the Docker Daemon must be run inside a Linux VM.
14-
Following the https://docs.docker.com/engine/installation/mac/[OS X installation
15-
instructions] to install Docker Toolbox which uses VirtualBox to host the required VM.
13+
The latest version of Docker runs as a native Mac application but isn't supported by
14+
docker-java. This means that you should use Docker Toolbox. See the
15+
https://docs.docker.com/engine/installation/mac/[OS X installation instructions] for
16+
details.
1617

1718
=== Docker on Linux
1819

spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void onNext(Frame item) {
233233

234234
private DockerClient createClient() {
235235
DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder()
236-
.build();
236+
.withVersion("1.19").build();
237237
DockerClient docker = DockerClientBuilder.getInstance(config)
238238
.withDockerCmdExecFactory(this.commandExecFactory).build();
239239
return docker;

0 commit comments

Comments
 (0)