Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
62fc6df5
Unverified
Commit
62fc6df5
authored
Jan 11, 2019
by
Davanum Srinivas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump Docker supported version to 18.09
For 1.14, let's switch to latest Docker 18.09 Change-Id: Ib8d4d9dd3cb51cf4780623389a4bcb101d3c8fa7
parent
0048d2da
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
docker_validator.go
cmd/kubeadm/app/util/system/docker_validator.go
+1
-1
docker_validator_test.go
cmd/kubeadm/app/util/system/docker_validator_test.go
+8
-2
image-util.sh
test/images/image-util.sh
+2
-0
No files found.
cmd/kubeadm/app/util/system/docker_validator.go
View file @
62fc6df5
...
...
@@ -38,7 +38,7 @@ func (d *DockerValidator) Name() string {
const
(
dockerConfigPrefix
=
"DOCKER_"
latestValidatedDockerVersion
=
"18.0
6
"
latestValidatedDockerVersion
=
"18.0
9
"
)
// TODO(random-liu): Add more validating items.
...
...
cmd/kubeadm/app/util/system/docker_validator_test.go
View file @
62fc6df5
...
...
@@ -92,8 +92,14 @@ func TestValidateDockerInfo(t *testing.T) {
warn
:
false
,
},
{
name
:
"Docker version 18.09.0 is not in the list of validated versions"
,
info
:
types
.
Info
{
Driver
:
"driver_2"
,
ServerVersion
:
"18.09.0"
},
name
:
"valid Docker version 18.09.1-ce"
,
info
:
types
.
Info
{
Driver
:
"driver_2"
,
ServerVersion
:
"18.09.1-ce"
},
err
:
false
,
warn
:
false
,
},
{
name
:
"Docker version 19.01.0 is not in the list of validated versions"
,
info
:
types
.
Info
{
Driver
:
"driver_2"
,
ServerVersion
:
"19.01.0"
},
err
:
false
,
warn
:
true
,
},
...
...
test/images/image-util.sh
View file @
62fc6df5
...
...
@@ -103,6 +103,8 @@ build() {
}
docker_version_check
()
{
# The reason for this version check is even though "docker manifest" command is available in 18.03, it does
# not work properly in that version. So we insist on 18.06.0 or higher.
docker_version
=
$(
docker version
--format
'{{.Client.Version}}'
|
cut
-d
"-"
-f1
)
if
[[
${
docker_version
}
!=
18.06.0
&&
${
docker_version
}
< 18.06.0
]]
;
then
echo
"Minimum docker version 18.06.0 is required for creating and pushing manifest images[found:
${
docker_version
}
]"
...
...
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