Merge branch 'centos8'
This commit is contained in:
commit
17a855d25e
|
@ -6,6 +6,7 @@ env:
|
||||||
global:
|
global:
|
||||||
- ROLE_NAME: docker
|
- ROLE_NAME: docker
|
||||||
matrix:
|
matrix:
|
||||||
|
- MOLECULE_DISTRO: centos8
|
||||||
- MOLECULE_DISTRO: centos7
|
- MOLECULE_DISTRO: centos7
|
||||||
- MOLECULE_DISTRO: ubuntu1804
|
- MOLECULE_DISTRO: ubuntu1804
|
||||||
- MOLECULE_DISTRO: ubuntu1604
|
- MOLECULE_DISTRO: ubuntu1604
|
||||||
|
|
|
@ -41,8 +41,8 @@ Docker Compose installation options.
|
||||||
(Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release.
|
(Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release.
|
||||||
|
|
||||||
docker_yum_repo_url: https://download.docker.com/linux/centos/docker-{{ docker_edition }}.repo
|
docker_yum_repo_url: https://download.docker.com/linux/centos/docker-{{ docker_edition }}.repo
|
||||||
docker_yum_repo_enable_edge: 0
|
docker_yum_repo_enable_edge: '0'
|
||||||
docker_yum_repo_enable_test: 0
|
docker_yum_repo_enable_test: '0'
|
||||||
|
|
||||||
(Used only for RedHat/CentOS.) You can enable the Edge or Test repo by setting the respective vars to `1`.
|
(Used only for RedHat/CentOS.) You can enable the Edge or Test repo by setting the respective vars to `1`.
|
||||||
|
|
||||||
|
|
|
@ -22,8 +22,8 @@ docker_apt_ignore_key_error: true
|
||||||
|
|
||||||
# Used only for RedHat/CentOS/Fedora.
|
# Used only for RedHat/CentOS/Fedora.
|
||||||
docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo
|
docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo
|
||||||
docker_yum_repo_enable_edge: 0
|
docker_yum_repo_enable_edge: '0'
|
||||||
docker_yum_repo_enable_test: 0
|
docker_yum_repo_enable_test: '0'
|
||||||
|
|
||||||
# A list of users who will be added to the docker group.
|
# A list of users who will be added to the docker group.
|
||||||
docker_users: []
|
docker_users: []
|
||||||
|
|
|
@ -10,8 +10,8 @@ galaxy_info:
|
||||||
platforms:
|
platforms:
|
||||||
- name: EL
|
- name: EL
|
||||||
versions:
|
versions:
|
||||||
- 6
|
|
||||||
- 7
|
- 7
|
||||||
|
- 8
|
||||||
- name: Fedora
|
- name: Fedora
|
||||||
versions:
|
versions:
|
||||||
- all
|
- all
|
||||||
|
|
|
@ -33,3 +33,9 @@
|
||||||
section: 'docker-{{ docker_edition }}-test'
|
section: 'docker-{{ docker_edition }}-test'
|
||||||
option: enabled
|
option: enabled
|
||||||
value: '{{ docker_yum_repo_enable_test }}'
|
value: '{{ docker_yum_repo_enable_test }}'
|
||||||
|
|
||||||
|
- name: Install containerd separately (CentOS 8).
|
||||||
|
package:
|
||||||
|
name: https://download.docker.com/linux/centos/7/x86_64/stable/Packages/containerd.io-1.2.6-3.3.el7.x86_64.rpm
|
||||||
|
state: present
|
||||||
|
when: ansible_distribution_major_version | int == 8
|
||||||
|
|
Loading…
Reference in New Issue
Block a user