From 4a5a69b5205e6452fb2566cc1219e6f44bf84578 Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Tue, 25 Nov 2014 14:39:49 -0800 Subject: [PATCH] Upgrade docker to 1.3.2. --- cluster/gce/config-test.sh | 3 +++ cluster/saltbase/salt/docker/init.sls | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index b94c23a36c9..54dbcd8efa5 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -36,3 +36,6 @@ MINION_SCOPES="storage-ro,compute-rw" POLL_SLEEP_INTERVAL=3 PORTAL_NET="10.0.0.0/16" MONITORING=false + +# When set to true, Docker Cache is enabled by default as part of the cluster bring up. +ENABLE_DOCKER_REGISTRY_CACHE=true diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls index 0151a23d9c8..e1e04df9690 100644 --- a/cluster/saltbase/salt/docker/init.sls +++ b/cluster/saltbase/salt/docker/init.sls @@ -44,6 +44,8 @@ purge-old-docker: pkg.removed: - pkgs: - lxc-docker-1.2.0 + - lxc-docker-1.3.0 + - lxc-docker-1.3.1 {{ environment_file }}: file.managed: @@ -70,9 +72,9 @@ purge-old-docker: # 7. Add the old version to purge-old-docker above. {% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %} -{% set deb='lxc-docker-1.3.0_1.3.0-20141016165047-c78088f_amd64.deb' %} -{% set deb_hash='sha1=99c2135e4f1f469b771226c3846e0b6accb6056a' %} -{% set docker_ver='1.3.0' %} +{% set deb='lxc-docker-1.3.2_1.3.2_amd64.deb' %} +{% set deb_hash='sha1=e271afeba8156fda9c6e7527c21ae237974a8c51' %} +{% set docker_ver='1.3.2' %} /var/cache/docker-install/{{ deb }}: file.managed: @@ -83,7 +85,7 @@ purge-old-docker: - mode: 644 - makedirs: true -# Drop the license file into /usr/share so that everyting is crystal clear. +# Drop the license file into /usr/share so that everything is crystal clear. /usr/share/doc/docker/apache.txt: file.managed: - source: {{ storage_base }}apache2.txt