From 3901b225e3f15afa9aaeb00b1efd9cdba1810410 Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Thu, 30 Jul 2015 13:50:36 -0700
Subject: [PATCH 1/2] Docker 1.7.1

---
 cluster/saltbase/salt/docker/init.sls | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
index fc1a6b5f97e..70290641e45 100644
--- a/cluster/saltbase/salt/docker/init.sls
+++ b/cluster/saltbase/salt/docker/init.sls
@@ -99,15 +99,9 @@ net.ipv4.ip_forward:
 
 {% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %}
 
-{% set override_deb='lxc-docker-1.6.0_1.6.0_amd64.deb' %}
-{% set override_deb_sha1='fdfd749362256877668e13e152d17fe22c64c420' %}
-{% set override_docker_ver='1.6.0' %}
-
-{% if grains.cloud is defined and grains.cloud == 'gce' %}
-{% set override_deb='' %}
-{% set override_deb_sha1='' %}
-{% set override_docker_ver='' %}
-{% endif %}
+{% set override_deb='lxc-docker-1.7.1_1.7.1_amd64.deb' %}
+{% set override_deb_sha1='81abef31dd2c616883a61f85bfb294d743b1c889' %}
+{% set override_docker_ver='1.7.1' %}
 
 {% if override_docker_ver != '' %}
 /var/cache/docker-install/{{ override_deb }}:
@@ -180,6 +174,9 @@ docker:
 {% endif %}
     - watch:
       - file: {{ environment_file }}
+{% if override_docker_ver != '' %}
+      - pkg: lxc-docker-{{ override_docker_ver }}
+{% endif %}
 {% if pillar.get('is_systemd') %}
       - file: {{ pillar.get('systemd_system_path') }}/docker.service
 {% endif %}
@@ -187,5 +184,4 @@ docker:
     - require:
       - pkg: lxc-docker-{{ override_docker_ver }}
 {% endif %}
-
 {% endif %} # end grains.os_family != 'RedHat'

From 1932b48db3d8b2974dbac780cf8286faba47cfe4 Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Mon, 10 Aug 2015 17:30:11 -0700
Subject: [PATCH 2/2] Restore the logic of disable docker upgrade through salt
 for gce. Currently it is commented out.

---
 cluster/saltbase/salt/docker/init.sls | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
index 70290641e45..0ef2e4c66f3 100644
--- a/cluster/saltbase/salt/docker/init.sls
+++ b/cluster/saltbase/salt/docker/init.sls
@@ -103,7 +103,19 @@ net.ipv4.ip_forward:
 {% set override_deb_sha1='81abef31dd2c616883a61f85bfb294d743b1c889' %}
 {% set override_docker_ver='1.7.1' %}
 
+# Comment out below logic for master branch, so that we can upgrade GCE cluster
+# to docker 1.7.1 by default.
+#
+# TODO(dchen1107): For release 1.1, we want to fall back to
+# ContainerVM installed docker by set override_deb, override_deb_sha1 and
+# override_docker_ver back to '' for gce cloud provider.
+
 {% if override_docker_ver != '' %}
+purge-old-docker-package:
+  pkg.removed:
+    - pkgs:
+      - lxc-docker-1.6.2
+
 /var/cache/docker-install/{{ override_deb }}:
   file.managed:
     - source: {{ storage_base }}{{ override_deb }}