Skip to content

Commit

Permalink
Merge pull request geerlingguy#477 from dbrennand/fix/geerlingguy#470
Browse files Browse the repository at this point in the history
Fix Issue geerlingguy#470
  • Loading branch information
geerlingguy authored Nov 23, 2024
2 parents 38911fc + 110cb89 commit a60f86e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions tasks/setup-Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
path: /etc/apt/trusted.gpg.d/docker.asc
state: absent

- name: Ensure old apt source list is not present in /etc/apt/sources.list.d
ansible.builtin.file:
path: /etc/apt/sources.list.d/download_docker_com_linux_ubuntu.list
state: absent

- name: Ensure the repo referencing the previous trusted.gpg.d key is not present
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 }}"
Expand All @@ -30,13 +35,13 @@
file:
path: /etc/apt/keyrings
state: directory
mode: '0755'
mode: "0755"

- name: Add Docker apt key.
ansible.builtin.get_url:
url: "{{ docker_apt_gpg_key }}"
dest: /etc/apt/keyrings/docker.asc
mode: '0644'
mode: "0644"
force: false
checksum: "{{ docker_apt_gpg_key_checksum | default(omit) }}"
register: add_repository_key
Expand Down

0 comments on commit a60f86e

Please # to comment.