fix: wip

README.md

@@ -12,10 +12,10 @@ docker_setup: yes                           # Install docker and dependencies
 docker_run: yes                             # Setup docker images/containers/networks
 
 docker_edition: ce
-docker_keysig: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
-docker_keyserver: hkp://pool.sks-keyservers.net
 docker_repo: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} edge"
 docker_opts: "--dns 8.8.8.8 --dns 8.8.4.4"  # Docker command line options
+docker_apt_key_id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+docker_apt_key_url: hkp://pool.sks-keyservers.net
 
 docker_compose_version: "1.21.0"
 docker_compose_release: "https://github.com/docker/compose/releases/download/{{docker_compose_version}}"   # Install docker-compose (set empty to skip)

defaults/main.yml

@@ -6,10 +6,14 @@ docker_setup: yes                           # Install docker and dependencies
 docker_run: yes                             # Setup docker images/containers/networks
 
 docker_edition: ce
-docker_keysig: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
-docker_keyserver: hkp://pool.sks-keyservers.net
-docker_repo: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} edge"
+docker_package: "docker-{{ docker_edition }}"
 docker_opts: "--dns 8.8.8.8 --dns 8.8.4.4"  # Docker command line options
+docker_repo_url: "https://download.docker.com/linux"
+
+docker_apt_release_channel: stable
+docker_apt_repo: "deb [arch=amd64] {{docker_repo_url}}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
+docker_apt_key_id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+docker_apt_key_url: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg"
 
 docker_compose_version: "1.21.0"
 docker_compose_release: "https://github.com/docker/compose/releases/download/{{docker_compose_version}}"   # Install docker-compose (set empty to skip)

tasks/setup.yml

@@ -1,23 +1,38 @@
 ---
 
+- name: Ensure old versions of Docker are not installed.
+  package:
+    name:
+      - docker
+      - docker-engine
+    state: absent
+
+- name: Ensure dependencies are installed.
+  apt:
+    name:
+      - apt-transport-https
+      - ca-certificates
+      - "{{ 'gnupg' if ansible_distribution == 'Ubuntu' or ansible_distribution_version is version('20.04', '>=') else 'gnupg2' }}"
+    state: present
+
 - name: Install requirements
   apt:
     name: "{{item}}"
   with_items: [apt-transport-https, ca-certificates, curl, gnupg-agent, software-properties-common]
 
 - name: Install Docker Key (Debian)
   apt_key:
-    id: "{{docker_keysig}}"
-    keyserver: "{{docker_keyserver}}"
+    id: "{{docker_apt_key_id}}"
+    url: "{{docker_apt_key_url}}"
 
 - name: Install Docker Repository (Debian)
   apt_repository:
-    repo: "{{docker_repo}}"
+    repo: "{{docker_apt_repo}}"
     update_cache: true
 
 - name: Install Docker
   apt:
-    name: "docker-{{ docker_edition }}"
+    name: "{{docker_package}}"
 
 - name: Configure Docker
   template: