root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Lower the minimum required Docker API version to 1.24 

Closes gh-19945
This commit is contained in:
Andy Wilkinson 2020-01-30 13:57:18 +00:00
parent 54b3f480b4
commit 28442b5ca5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
View File

@ -49,6 +49,8 @@ import org.springframework.util.StringUtils;
public class DockerApi {
private static final List<String> 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++]);

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java
View File

@ -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";