diff --git a/README.md b/README.md index 9a49840..390e3ce 100644 --- a/README.md +++ b/README.md @@ -37,12 +37,14 @@ 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_gpg_key: https://download.docker.com/linux/ubuntu/gpg (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_enable_edge: 0 docker_yum_repo_enable_test: 0 + docker_yum_gpg_key: https://download.docker.com/linux/centos/gpg (Used only for RedHat/CentOS.) You can enable the Edge or Test repo by setting the respective vars to `1`. diff --git a/defaults/main.yml b/defaults/main.yml index 2bcb620..6974534 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,11 +19,13 @@ 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_gpg_key: https://download.docker.com/linux/ubuntu/gpg # 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_enable_edge: 0 docker_yum_repo_enable_test: 0 +docker_yum_gpg_key: https://download.docker.com/linux/centos/gpg # A list of users who will be added to the docker group. docker_users: [] diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 23a49ae..71c4c35 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -15,7 +15,7 @@ - name: Add Docker apt key. apt_key: - url: https://download.docker.com/linux/ubuntu/gpg + url: "{{ docker_apt_gpg_key }}" id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 state: present register: add_repository_key @@ -26,7 +26,7 @@ when: add_repository_key is failed - name: Add Docker apt key (alternative for older systems without SNI). - shell: "curl -sSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -" + shell: "curl -sSL {{ docker_apt_gpg_key }} | sudo apt-key add -" args: warn: false when: add_repository_key is failed diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 0cd1a50..bbeeda4 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -9,7 +9,7 @@ - name: Add Docker GPG key. rpm_key: - key: https://download.docker.com/linux/centos/gpg + key: "{{ docker_yum_gpg_key }}" state: present - name: Add Docker repository.