Merge pull request #2991 from dchen1107/newdocker

Move salt based clusters to Docker 1.4.1
pull/6/head
Daniel Smith 2014-12-16 16:57:31 -08:00
commit 8e33229792
1 changed files with 4 additions and 3 deletions

View File

@ -48,6 +48,7 @@ purge-old-docker:
- lxc-docker-1.3.1
- lxc-docker-1.3.2
- lxc-docker-1.3.3
- lxc-docker-1.4.0
{{ environment_file }}:
file.managed:
@ -74,9 +75,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.4.0_1.4.0_amd64.deb' %}
{% set deb_hash='sha1=982ac901554c9e434a947675fe8dc670cb8cea93' %}
{% set docker_ver='1.4.0' %}
{% set deb='lxc-docker-1.4.1_1.4.1_amd64.deb' %}
{% set deb_hash='sha1=726507f529583c46d3c9863340ae74ab39c30078' %}
{% set docker_ver='1.4.1' %}
/var/cache/docker-install/{{ deb }}:
file.managed: