Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Docker supported version to 18.09 #72823

Merged
merged 1 commit into from Jan 15, 2019
Merged

Bump Docker supported version to 18.09 #72823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/util/system/docker_validator.go
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ func (d *DockerValidator) Name() string {

const (
dockerConfigPrefix = "DOCKER_"
latestValidatedDockerVersion = "18.06"
latestValidatedDockerVersion = "18.09"
)

// TODO(random-liu): Add more validating items.
Expand Down
10 changes: 8 additions & 2 deletions cmd/kubeadm/app/util/system/docker_validator_test.go
View file
Open in desktop
Expand Up @@ -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,
},
Expand Down
2 changes: 2 additions & 0 deletions test/images/image-util.sh
View file
Open in desktop
Expand Up @@ -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}]"
Expand Down