mirror of
https://github.com/geerlingguy/ansible-role-docker.git
synced 2025-09-07 17:52:30 +02:00
Merge ab942b57e8
into 94b787389d
This commit is contained in:
commit
ad6c8923a3
@ -9,6 +9,15 @@
|
|||||||
path: "/etc/apt/sources.list.d/download_docker_com_linux_{{ docker_apt_ansible_distribution | lower }}.list"
|
path: "/etc/apt/sources.list.d/download_docker_com_linux_{{ docker_apt_ansible_distribution | lower }}.list"
|
||||||
state: absent
|
state: absent
|
||||||
|
|
||||||
|
- name: Ensure dependencies are installed.
|
||||||
|
apt:
|
||||||
|
name:
|
||||||
|
- apt-transport-https
|
||||||
|
- ca-certificates
|
||||||
|
- gpg
|
||||||
|
state: present
|
||||||
|
when: docker_add_repo | bool
|
||||||
|
|
||||||
- name: Ensure the repo referencing the previous trusted.gpg.d key is not present
|
- name: Ensure the repo referencing the previous trusted.gpg.d key is not present
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
|
repo: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
|
||||||
@ -23,14 +32,6 @@
|
|||||||
name: "{{ docker_obsolete_packages }}"
|
name: "{{ docker_obsolete_packages }}"
|
||||||
state: absent
|
state: absent
|
||||||
|
|
||||||
- name: Ensure dependencies are installed.
|
|
||||||
apt:
|
|
||||||
name:
|
|
||||||
- apt-transport-https
|
|
||||||
- ca-certificates
|
|
||||||
state: present
|
|
||||||
when: docker_add_repo | bool
|
|
||||||
|
|
||||||
- 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