[feat] Add docker_apt_key_url, docker_apt_key_id variables

This commit is contained in:
Abdelkader 2018-12-19 10:13:30 +01:00
parent fa1a56824e
commit 4a9f9d6ec9
3 changed files with 6 additions and 2 deletions

View File

@ -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.

View File

@ -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

View File

@ -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 }}"