Mirrors/geerlingguy.ansible-role-docker
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-docker.git synced 2024-11-18 19:10:43 +01:00
Code Issues Projects Releases Wiki Activity

added option to set docker gpg key

Browse Source
This commit is contained in:
Felix Herzog 2019-03-19 19:33:20 +01:00
parent fa1a56824e
commit 5a4045d5c1
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -37,12 +37,14 @@ Docker Compose installation options.
docker_apt_arch: amd64 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_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_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. (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_url: https://download.docker.com/linux/centos/docker-{{ docker_edition }}.repo
docker_yum_repo_enable_edge: 0 docker_yum_repo_enable_edge: 0
docker_yum_repo_enable_test: 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`. (Used only for RedHat/CentOS.) You can enable the Edge or Test repo by setting the respective vars to `1`.

2
defaults/main.yml
View File

@ -19,11 +19,13 @@ docker_apt_release_channel: stable
docker_apt_arch: amd64 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_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_ignore_key_error: true
docker_apt_gpg_key: https://download.docker.com/linux/ubuntu/gpg
# Used only for RedHat/CentOS/Fedora. # 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_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_edge: 0
docker_yum_repo_enable_test: 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. # A list of users who will be added to the docker group.
docker_users: [] docker_users: []

4
tasks/setup-Debian.yml
View File

@ -15,7 +15,7 @@
- name: Add Docker apt key. - name: Add Docker apt key.
apt_key: apt_key:
url: https://download.docker.com/linux/ubuntu/gpg url: "{{ docker_apt_gpg_key }}"
id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
state: present state: present
register: add_repository_key register: add_repository_key
@ -26,7 +26,7 @@
when: add_repository_key is failed when: add_repository_key is failed
- name: Add Docker apt key (alternative for older systems without SNI). - 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: args:
warn: false warn: false
when: add_repository_key is failed when: add_repository_key is failed

2
tasks/setup-RedHat.yml
View File

@ -9,7 +9,7 @@
- name: Add Docker GPG key. - name: Add Docker GPG key.
rpm_key: rpm_key:
key: https://download.docker.com/linux/centos/gpg key: "{{ docker_yum_gpg_key }}"
state: present state: present
- name: Add Docker repository. - name: Add Docker repository.