github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

Docker 1.7.1

Browse Source
This commit is contained in:
Dawn Chen 2015-07-30 13:50:36 -07:00
parent 296ffdf925
commit 3901b225e3
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'