Browse Source

Merge pull request #500 from kubespray/docker1.12.1

Add Docker 1.12.1 version
pull/508/merge
Smaine Kahlouch 8 years ago
committed by GitHub
parent
commit
0cc581b2da
4 changed files with 5 additions and 5 deletions
  1. 2
      roles/docker/vars/debian.yml
  2. 2
      roles/docker/vars/fedora.yml
  3. 4
      roles/docker/vars/ubuntu-16.04.yml
  4. 2
      roles/docker/vars/ubuntu.yml

2
roles/docker/vars/debian.yml

@ -6,7 +6,7 @@ docker_versioned_pkg:
1.9: docker-engine=1.9.1-0~{{ ansible_distribution_release|lower }} 1.9: docker-engine=1.9.1-0~{{ ansible_distribution_release|lower }}
1.10: docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }} 1.10: docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }}
1.11: docker-engine=1.11.2-0~{{ ansible_distribution_release|lower }} 1.11: docker-engine=1.11.2-0~{{ ansible_distribution_release|lower }}
1.12: docker-engine=1.12.0-0~{{ ansible_distribution_release|lower }}
1.12: docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }}
docker_package_info: docker_package_info:
pkg_mgr: apt pkg_mgr: apt

2
roles/docker/vars/fedora.yml

@ -5,7 +5,7 @@ docker_versioned_pkg:
1.9: docker-1:1.9.1 1.9: docker-1:1.9.1
1.10: docker-1:1.10.1 1.10: docker-1:1.10.1
1.11: docker-1:1.11.2 1.11: docker-1:1.11.2
1.12: docker-1:1.12.0
1.12: docker-1:1.12.1
docker_package_info: docker_package_info:
pkg_mgr: dnf pkg_mgr: dnf

4
roles/docker/vars/ubuntu-16.04.yml

@ -2,11 +2,11 @@
docker_version: 1.11 docker_version: 1.11
docker_kernel_min_version: '3.2' docker_kernel_min_version: '3.2'
# https://apt.dockerproject.org/repo/dists/ubuntu-trusty/main/filelist
# https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist
docker_versioned_pkg: docker_versioned_pkg:
latest: docker-engine latest: docker-engine
1.11: docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }} 1.11: docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }}
1.12: docker-engine=1.12.0-0~{{ ansible_distribution_release|lower }}
1.12: docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }}
docker_package_info: docker_package_info:
pkg_mgr: apt pkg_mgr: apt

2
roles/docker/vars/ubuntu.yml

@ -7,7 +7,7 @@ docker_versioned_pkg:
1.9: docker-engine=1.9.0-0~{{ ansible_distribution_release|lower }} 1.9: docker-engine=1.9.0-0~{{ ansible_distribution_release|lower }}
1.10: docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }} 1.10: docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }}
1.11: docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }} 1.11: docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }}
1.12: docker-engine=1.12.0-0~{{ ansible_distribution_release|lower }}
1.12: docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }}
docker_package_info: docker_package_info:
pkg_mgr: apt pkg_mgr: apt

Loading…
Cancel
Save