From 03fb74400b4bbc324d33df195042bd8e5d335c0d Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 9 Oct 2015 13:26:16 -0700 Subject: [PATCH] Upgrade to docker 1.8.3 --- cluster/saltbase/salt/docker/init.sls | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls index 3aca7d7610b..83ed8b63d40 100644 --- a/cluster/saltbase/salt/docker/init.sls +++ b/cluster/saltbase/salt/docker/init.sls @@ -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' %}