Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update launch script integration tests to work with Docker 1.12

Browse Source 
Closes gh-6914 (I hope)
This commit is contained in:
Andy Wilkinson 2016-09-18 22:09:35 +01:00
parent 04b261984e
commit 5a539ce381
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc
View File

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

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

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