mirror of
https://github.com/geerlingguy/ansible-role-docker.git
synced 2024-11-23 19:06:54 +01:00
Merge pull request #456 from jamesmyatt/no-gnupg-required
gnupg no longer prerequisite
This commit is contained in:
commit
c0ce31085c
@ -19,18 +19,6 @@
|
|||||||
state: present
|
state: present
|
||||||
when: docker_add_repo | bool
|
when: docker_add_repo | bool
|
||||||
|
|
||||||
- name: Ensure additional dependencies are installed (on Ubuntu < 20.04 and any other systems).
|
|
||||||
apt:
|
|
||||||
name: gnupg2
|
|
||||||
state: present
|
|
||||||
when: ansible_distribution != 'Ubuntu' or ansible_distribution_version is version('20.04', '<')
|
|
||||||
|
|
||||||
- name: Ensure additional dependencies are installed (on Ubuntu >= 20.04).
|
|
||||||
apt:
|
|
||||||
name: gnupg
|
|
||||||
state: present
|
|
||||||
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '>=')
|
|
||||||
|
|
||||||
- name: Ensure directory exists for /etc/apt/keyrings
|
- name: Ensure directory exists for /etc/apt/keyrings
|
||||||
file:
|
file:
|
||||||
path: /etc/apt/keyrings
|
path: /etc/apt/keyrings
|
||||||
|
Loading…
Reference in New Issue
Block a user