scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15642 from dchen1107/docker

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-15 03:02:17 -07:00
parent b8aabbbf4f 03fb74400b
commit b799d57e7b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,16 +99,16 @@ net.ipv4.ip_forward:
{% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %}
# Only upgrade Docker to 1.8.2 for the containerVM image.
# Only upgrade Docker to 1.8.3 for the containerVM image.
# TODO(dchen1107): For release 1.1, we want to update the ContainerVM image to
# include Docker 1.8.2 and comment out the upgrade below.
# include Docker 1.8.3 and comment out the upgrade below.
{% if grains.get('cloud', '') == 'gce'
and grains.get('os_family', '') == 'Debian'
and grains.get('oscodename', '') == 'wheezy' -%}
{% set docker_pkg_name='docker-engine' %}
{% set override_deb='docker-engine_1.8.2-0~wheezy_amd64.deb' %}
{% set override_deb_sha1='dcff80bffcbde458508da58d2a9fe7bef8eed404' %}
{% set override_docker_ver='1.8.2-0~wheezy' %}
{% set override_deb='docker-engine_1.8.3-0~wheezy_amd64.deb' %}
{% set override_deb_sha1='f812e1134e7375b29886a372a6e24d04e1ee33c9' %}
{% set override_docker_ver='1.8.3-0~wheezy' %}
{% else %}
{% set docker_pkg_name='lxc-docker-1.7.1' %}
{% set override_docker_ver='1.7.1' %}