From 28442b5ca5c2f2619f490bac0b5daca4fa0f869e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 30 Jan 2020 13:57:18 +0000 Subject: [PATCH] Lower the minimum required Docker API version to 1.24 Closes gh-19945 --- .../boot/buildpack/platform/docker/DockerApi.java | 4 +++- .../boot/buildpack/platform/docker/DockerApiTests.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java index 4c1ccbf525..fdc61dc7a4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java @@ -49,6 +49,8 @@ import org.springframework.util.StringUtils; public class DockerApi { private static final List FORCE_PARAMS = Collections.unmodifiableList(Arrays.asList("force", "1")); + + static final String API_VERSION = "v1.24"; private final Http http; @@ -94,7 +96,7 @@ public class DockerApi { private URI buildUrl(String path, String... params) { try { - URIBuilder builder = new URIBuilder("docker://localhost/v1.40" + path); + URIBuilder builder = new URIBuilder("docker://localhost/" + API_VERSION + path); int param = 0; while (param < params.length) { builder.addParameter(params[param++], params[param++]); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java index d816f5b07d..08a2773cc8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java @@ -64,7 +64,7 @@ import static org.mockito.Mockito.verify; */ class DockerApiTests { - private static final String API_URL = "docker://localhost/v1.40"; + private static final String API_URL = "docker://localhost/" + DockerApi.API_VERSION; private static final String IMAGES_URL = API_URL + "/images";