github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-04 15:50:36 -08:00
commit 23aa8565e2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/saltbase/salt/docker/init.sls
View File

@ -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: