Upgrade docker version and do some cleanups for unsupported distros/docker versions
This commit is contained in:
parent
93663e987c
commit
ab7df10a7d
8 changed files with 9 additions and 62 deletions
|
@ -1,4 +1,4 @@
|
||||||
docker_version: '1.10'
|
docker_version: '1.12'
|
||||||
|
|
||||||
docker_package_info:
|
docker_package_info:
|
||||||
pkgs:
|
pkgs:
|
||||||
|
|
|
@ -48,8 +48,7 @@
|
||||||
copy:
|
copy:
|
||||||
src: "rh_docker.repo"
|
src: "rh_docker.repo"
|
||||||
dest: "/etc/yum.repos.d/docker.repo"
|
dest: "/etc/yum.repos.d/docker.repo"
|
||||||
when: ansible_distribution in ["CentOS","RedHat"] and
|
when: ansible_distribution in ["CentOS","RedHat"]
|
||||||
ansible_distribution_major_version >= 7
|
|
||||||
|
|
||||||
- name: ensure docker packages are installed
|
- name: ensure docker packages are installed
|
||||||
action: "{{ docker_package_info.pkg_mgr }}"
|
action: "{{ docker_package_info.pkg_mgr }}"
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
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:
|
|
||||||
- name: docker-io
|
|
||||||
|
|
||||||
docker_repo_key_info:
|
|
||||||
pkg_key: ''
|
|
||||||
repo_keys: []
|
|
||||||
|
|
||||||
docker_repo_info:
|
|
||||||
pkg_repo: ''
|
|
||||||
repos: []
|
|
|
@ -1,10 +1,8 @@
|
||||||
docker_kernel_min_version: '3.2'
|
docker_kernel_min_version: '3.10'
|
||||||
|
|
||||||
# https://apt.dockerproject.org/repo/dists/debian-wheezy/main/filelist
|
# https://apt.dockerproject.org/repo/dists/debian-wheezy/main/filelist
|
||||||
docker_versioned_pkg:
|
docker_versioned_pkg:
|
||||||
'latest': docker-engine
|
'latest': docker-engine
|
||||||
'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.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.5-0~debian-{{ ansible_distribution_release|lower }}
|
'1.12': docker-engine=1.12.5-0~debian-{{ ansible_distribution_release|lower }}
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,6 @@ docker_kernel_min_version: '0'
|
||||||
|
|
||||||
docker_versioned_pkg:
|
docker_versioned_pkg:
|
||||||
'latest': docker
|
'latest': docker
|
||||||
'1.9': docker-1:1.9.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.5
|
'1.12': docker-1:1.12.5
|
||||||
|
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
---
|
|
||||||
docker_version: '1.11'
|
|
||||||
docker_kernel_min_version: '3.2'
|
|
||||||
|
|
||||||
# https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist
|
|
||||||
docker_versioned_pkg:
|
|
||||||
'latest': docker-engine
|
|
||||||
'1.11': docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }}
|
|
||||||
'1.12': docker-engine=1.12.5-0~ubuntu-{{ ansible_distribution_release|lower }}
|
|
||||||
|
|
||||||
docker_package_info:
|
|
||||||
pkg_mgr: apt
|
|
||||||
pkgs:
|
|
||||||
- name: "{{ docker_versioned_pkg[docker_version | string] }}"
|
|
||||||
force: yes
|
|
||||||
|
|
||||||
docker_repo_key_info:
|
|
||||||
pkg_key: apt_key
|
|
||||||
keyserver: hkp://p80.pool.sks-keyservers.net:80
|
|
||||||
repo_keys:
|
|
||||||
- 58118E89F3A912897C070ADBF76221572C52609D
|
|
||||||
|
|
||||||
docker_repo_info:
|
|
||||||
pkg_repo: apt_repository
|
|
||||||
repos:
|
|
||||||
- >
|
|
||||||
deb https://apt.dockerproject.org/repo
|
|
||||||
{{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
|
|
||||||
main
|
|
|
@ -1,11 +1,10 @@
|
||||||
|
---
|
||||||
|
docker_version: '1.12'
|
||||||
|
docker_kernel_min_version: '3.10'
|
||||||
|
|
||||||
docker_kernel_min_version: '3.2'
|
# https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist
|
||||||
|
|
||||||
# https://apt.dockerproject.org/repo/dists/ubuntu-trusty/main/filelist
|
|
||||||
docker_versioned_pkg:
|
docker_versioned_pkg:
|
||||||
'latest': docker-engine
|
'latest': docker-engine
|
||||||
'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.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.5-0~ubuntu-{{ ansible_distribution_release|lower }}
|
'1.12': docker-engine=1.12.5-0~ubuntu-{{ ansible_distribution_release|lower }}
|
||||||
|
|
||||||
|
|
|
@ -117,8 +117,7 @@
|
||||||
|
|
||||||
- name: Install epel-release on RedHat/CentOS
|
- name: Install epel-release on RedHat/CentOS
|
||||||
shell: rpm -qa | grep epel-release || rpm -ivh {{ epel_rpm_download_url }}
|
shell: rpm -qa | grep epel-release || rpm -ivh {{ epel_rpm_download_url }}
|
||||||
when: ansible_distribution in ["CentOS","RedHat"] and
|
when: ansible_distribution in ["CentOS","RedHat"]
|
||||||
ansible_distribution_major_version >= 7
|
|
||||||
changed_when: False
|
changed_when: False
|
||||||
tags: bootstrap-os
|
tags: bootstrap-os
|
||||||
|
|
||||||
|
@ -182,7 +181,6 @@
|
||||||
|
|
||||||
- include: growpart-azure-centos-7.yml
|
- include: growpart-azure-centos-7.yml
|
||||||
when: azure_check.stat.exists and
|
when: azure_check.stat.exists and
|
||||||
ansible_distribution in ["CentOS","RedHat"] and
|
ansible_distribution in ["CentOS","RedHat"]
|
||||||
ansible_distribution_major_version >= 7
|
|
||||||
tags: bootstrap-os
|
tags: bootstrap-os
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue