Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
28442b5c
Commit
28442b5c
authored
Jan 30, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Lower the minimum required Docker API version to 1.24
Closes gh-19945
parent
54b3f480
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
DockerApi.java
...ngframework/boot/buildpack/platform/docker/DockerApi.java
+3
-1
DockerApiTests.java
...mework/boot/buildpack/platform/docker/DockerApiTests.java
+1
-1
No files found.
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
View file @
28442b5c
...
...
@@ -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
++]);
...
...
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java
View file @
28442b5c
...
...
@@ -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"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment