Skip to content

K
k3s
Commit 23aa8565 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #20851 from vmware/vsphere-docker-version-fix

Auto commit by PR queue bot
parents 9bfd70f8 e1a7441b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
cluster/saltbase/salt/docker/init.sls
View file @ 23aa8565
...@@ -125,9 +125,14 @@ cbr0: ...@@ -125,9 +125,14 @@ cbr0:
- require: - require:
- cmd: 'apt-update' - cmd: 'apt-update'
# restricting docker version to 1.9. with older version of docker we are facing
# issue https://github.com/docker/docker/issues/18793.
# newer version of docker 1.10.0 is not well tested yet.
# full comments: https://github.com/kubernetes/kubernetes/pull/20851
docker-engine: docker-engine:
pkg: pkg:
- installed - installed
- version: 1.9.*
- require: - require:
- file: /etc/apt/sources.list.d/docker.list - file: /etc/apt/sources.list.d/docker.list
docker: docker:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment