diff --git a/README.md b/README.md index 9a49840..8f33546 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,8 @@ Docker Compose installation options. docker_apt_arch: amd64 docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: True + docker_apt_key_url: "https://download.docker.com/linux/ubuntu/gpg" + docker_apt_key_id: "9DC858229FC7DD38854AE2D88D81803C0EBFCD88" (Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release. diff --git a/defaults/main.yml b/defaults/main.yml index 2bcb620..7381376 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,6 +19,8 @@ docker_apt_release_channel: stable docker_apt_arch: amd64 docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: true +docker_apt_key_url: "https://download.docker.com/linux/ubuntu/gpg" +docker_apt_key_id: "9DC858229FC7DD38854AE2D88D81803C0EBFCD88" # 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 diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 23a49ae..e81d1ab 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -15,8 +15,8 @@ - name: Add Docker apt key. apt_key: - url: https://download.docker.com/linux/ubuntu/gpg - id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 + url: "{{ docker_apt_key_url }}" + id: "{{ docker_apt_key_id }}" state: present register: add_repository_key ignore_errors: "{{ docker_apt_ignore_key_error }}"