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

Merge pull request #19869 from justinsb/aws_fix_docker183_package_name

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-01 10:18:06 -08:00
commit a5f03173c5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,8 +212,8 @@ net.ipv4.ip_forward:
and grains.get('os_family', '') == 'Debian'
and grains.get('oscodename', '') == 'vivid' -%}
# TODO: Get from google storage?
{% set docker_pkg_name='docker-engine-1.8.3' %}
{% set override_docker_ver='1.8.3' %}
{% set docker_pkg_name='docker-engine' %}
{% set override_docker_ver='1.8.3-0~vivid' %}
{% set override_deb='docker-engine_1.8.3-0~vivid_amd64.deb' %}
{% set override_deb_url='http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.8.3-0~vivid_amd64.deb' %}
{% set override_deb_sha1='f0259b1f04635977325c0cfa7c0006e1e5de1341' %}