Merge branch 'master' into use_custom_yum_repos

.ansible-lint

@@ -1,2 +1,3 @@
 skip_list:
   - '306'
+  - '106'

.travis.yml

@@ -8,12 +8,17 @@ env:
   matrix:
     - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu2004
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian10
     - MOLECULE_DISTRO: debian9
     - MOLECULE_DISTRO: fedora31
 
+before_install:
+  # Upgrade Docker to work with docker-py.
+  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
+
 install:
   # Install test dependencies.
   - pip install molecule yamllint ansible-lint docker

.yamllint

@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 200
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml

README.md

@@ -28,7 +28,7 @@ You can control whether the package is installed, uninstalled, or at the latest
 Variables to control the state of the `docker` service, and whether it should start on boot. If you're installing Docker inside a Docker container without systemd or sysvinit, you should set these to `stopped` and set the enabled variable to `no`.
 
     docker_install_compose: true
-    docker_compose_version: "1.25.4"
+    docker_compose_version: "1.26.0"
     docker_compose_path: /usr/local/bin/docker-compose
 
 Docker Compose installation options.

defaults/main.yml

@@ -11,7 +11,7 @@ docker_restart_handler_state: restarted
 
 # Docker Compose options.
 docker_install_compose: true
-docker_compose_version: "1.25.4"
+docker_compose_version: "1.26.0"
 docker_compose_path: /usr/local/bin/docker-compose
 
 # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed.

meta/main.yml

@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: docker
   author: geerlingguy
   description: Docker for Linux.
   company: "Midwestern Mac, LLC"
@@ -23,6 +24,7 @@ galaxy_info:
       versions:
         - xenial
         - bionic
+        - focal
   galaxy_tags:
     - web
     - system

tasks/setup-RedHat.yml

@@ -37,10 +37,37 @@
         option: enabled
         value: '{{ docker_yum_repo_enable_test }}'
 
+    - name: Configure Docker Edge repo.
+      ini_file:
+        dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
+        section: 'docker-{{ docker_edition }}-edge'
+        option: enabled
+        value: '{{ docker_yum_repo_enable_edge }}'
+        mode: 0644
+
+    - name: Configure Docker Test repo.
+      ini_file:
+        dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
+        section: 'docker-{{ docker_edition }}-test'
+        option: enabled
+        value: '{{ docker_yum_repo_enable_test }}'
+        mode: 0644
+    
   when: docker_yum_add_official_repository
 
-- name: Install containerd separately (CentOS 8).
+- name: Configure containerd on RHEL 8.
+  block:
+    - name: Ensure container-selinux is installed.
       package:
-    name: https://download.docker.com/linux/centos/7/x86_64/stable/Packages/containerd.io-1.2.6-3.3.el7.x86_64.rpm
+        name: container-selinux
+        state: present
+
+    - name: Disable container-tools module.
+      command: dnf -y module disable container-tools
+      changed_when: false
+
+    - name: Ensure containerd.io is installed.
+      package:
+        name: containerd.io
         state: present
   when: ansible_distribution_major_version | int == 8