From 5a539ce381545a64a122ce49494ec51e0a35213e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sun, 18 Sep 2016 22:09:35 +0100 Subject: [PATCH] Update launch script integration tests to work with Docker 1.12 Closes gh-6914 (I hope) --- .../spring-boot-launch-script-tests/README.adoc | 7 ++++--- .../boot/launchscript/SysVinitLaunchScriptIT.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc b/spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc index c6d37f8da3..84d96700bd 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc @@ -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 diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java index 0a6e8b5dcc..2a1b01f422 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java @@ -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;