diff --git a/roles/docker/vars/centos-6.yml b/roles/docker/vars/centos-6.yml index b657b386d7346c959a347c6469a8c05896723e78..10f2aa9be38e33a7e6db2cdf92e235cf28eb8434 100644 --- a/roles/docker/vars/centos-6.yml +++ b/roles/docker/vars/centos-6.yml @@ -1,5 +1,7 @@ docker_kernel_min_version: '2.6.32-431' +# versioning: docker-io itself is pinned at docker 1.5 + docker_package_info: pkg_mgr: yum pkgs: diff --git a/roles/docker/vars/debian.yml b/roles/docker/vars/debian.yml index b4d8209f0c201b4a7910391a0eda6f5383d67dd5..aed7121f239c0bb7b26a34b0c1ba8c19e6b23a03 100644 --- a/roles/docker/vars/debian.yml +++ b/roles/docker/vars/debian.yml @@ -1,10 +1,15 @@ docker_kernel_min_version: '3.2' -docker_version: 1.9.1-0~{{ ansible_distribution_release|lower }} + +# https://apt.dockerproject.org/repo/dists/debian-wheezy/main/filelist +docker_versioned_pkg: + latest: docker-engine + 1.9: docker-engine=1.9.1-0~{{ ansible_distribution_release|lower }} + 1.10: docker-engine=1.10.0-0~{{ ansible_distribution_release|lower }} docker_package_info: pkg_mgr: apt pkgs: - - docker-engine={{ docker_version }} + - "{{ docker_versioned_pkg[docker_version] }}" docker_repo_key_info: pkg_key: apt_key diff --git a/roles/docker/vars/fedora-20.yml b/roles/docker/vars/fedora-20.yml index 87fdcccd89527fb9eaee478bda914ab11787a39e..520469279d6cad1fe63b0c33305ab88c41b23a3e 100644 --- a/roles/docker/vars/fedora-20.yml +++ b/roles/docker/vars/fedora-20.yml @@ -1,5 +1,7 @@ docker_kernel_min_version: '0' +# versioning: docker-io itself is pinned at docker 1.5 + docker_package_info: pkg_mgr: yum pkgs: diff --git a/roles/docker/vars/fedora.yml b/roles/docker/vars/fedora.yml index 7f92dfb063e155bf7b8e6e31182e9094e3db2f9b..aae1c024d282ef5687d9e33e1bc89c5e74adb043 100644 --- a/roles/docker/vars/fedora.yml +++ b/roles/docker/vars/fedora.yml @@ -1,9 +1,13 @@ docker_kernel_min_version: '0' +docker_versioned_pkg: + latest: docker + 1.9: docker-1:1.9.1 + docker_package_info: pkg_mgr: dnf pkgs: - - docker + - "{{ docker_versioned_pkg[docker_version] }}" docker_repo_key_info: pkg_key: '' diff --git a/roles/docker/vars/ubuntu.yml b/roles/docker/vars/ubuntu.yml index 311d73a54a2ed3a4755a37e170f4cbd98ce30ed8..853b2798bb0f1fcbf18c9afaefbabf1c23a37a3b 100644 --- a/roles/docker/vars/ubuntu.yml +++ b/roles/docker/vars/ubuntu.yml @@ -1,10 +1,14 @@ docker_kernel_min_version: '3.2' -docker_version: 1.9.0-0~{{ ansible_distribution_release }} + +# https://apt.dockerproject.org/repo/dists/ubuntu-trusty/main/filelist +docker_versioned_pkg: + latest: docker-engine + 1.9: docker-engine=1.9.0-0~{{ ansible_distribution_release|lower }} docker_package_info: pkg_mgr: apt pkgs: - - docker-engine={{ docker_version }} + - "{{ docker_versioned_pkg[docker_version] }}" docker_repo_key_info: pkg_key: apt_key