From f666736e7957a17c5b0b39712e97d30bf53cffd7 Mon Sep 17 00:00:00 2001
From: Dan Rough <dan@g.games>
Date: Thu, 30 May 2024 14:12:01 +0100
Subject: [PATCH] Remove trusted.gpg.d artifacts. Fixes
 geerlingguy/ansible-role-docker#460

---
 tasks/setup-Debian.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index a864b3f..53ee5e5 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -1,4 +1,17 @@
 ---
+- name: Ensure apt key is not present in trusted.gpg.d
+  ansible.builtin.file:
+    path: /etc/apt/trusted.gpg.d/docker.asc
+    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 }}"
+    state: absent
+    filename: "{{ docker_apt_filename }}"
+    update_cache: true
+  when: docker_add_repo | bool
+
 - # See https://docs.docker.com/engine/install/debian/#uninstall-old-versions
   name: Ensure old versions of Docker are not installed.
   package: