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 1/4] 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 a864b3f0..53ee5e55 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:

From d3cbb31f8d9ff166f9d0e6d5575bd667146c4f32 Mon Sep 17 00:00:00 2001
From: Yemtex <55879864+Yemtex@users.noreply.github.com>
Date: Mon, 26 Aug 2024 00:09:55 +0200
Subject: [PATCH 2/4] Updated docker compose and docker compose plugin default
 values

README now shows, that this role is using the recommended docker compose plugin
---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e679eb45..f9d5ac1c 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ docker_restart_handler_state: restarted
 Variables to control the state of the `docker` service, and whether it should start on boot. If you're installing Docker inside a Docker container without systemd or sysvinit, you should set `docker_service_manage` to `false`.
 
 ```yaml
-docker_install_compose_plugin: false
+docker_install_compose_plugin: true
 docker_compose_package: docker-compose-plugin
 docker_compose_package_state: present
 ```
@@ -59,9 +59,10 @@ docker_compose_package_state: present
 Docker Compose Plugin installation options. These differ from the below in that docker-compose is installed as a docker plugin (and used with `docker compose`) instead of a standalone binary.
 
 ```yaml
-docker_install_compose: true
-docker_compose_version: "1.26.0"
+docker_install_compose: false
+docker_compose_version: "2.11.1"
 docker_compose_arch: "{{ ansible_architecture }}"
+docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-linux-{{ docker_compose_arch }}"
 docker_compose_path: /usr/local/bin/docker-compose
 ```
 

From 6e27357dedd6b90d0797517da48cd800f6a55bc2 Mon Sep 17 00:00:00 2001
From: Jan Langrehr <32090308+strgalt-t@users.noreply.github.com>
Date: Wed, 28 Aug 2024 17:00:43 +0200
Subject: [PATCH 3/4] Bump docker_compose_version to v2.29.2

---
 defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 7449b5bd..6cbf9437 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -29,7 +29,7 @@ docker_compose_package_state: present
 
 # Docker Compose options.
 docker_install_compose: false
-docker_compose_version: "v2.11.1"
+docker_compose_version: "v2.29.2"
 docker_compose_arch: "{{ ansible_architecture }}"
 docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-linux-{{ docker_compose_arch }}"
 docker_compose_path: /usr/local/bin/docker-compose

From 78790de1d7df3854179fbd17e4a50e8d0c4c0517 Mon Sep 17 00:00:00 2001
From: Jan Langrehr <janlangrehr@posteo.de>
Date: Sat, 31 Aug 2024 18:43:01 +0200
Subject: [PATCH 4/4] Align docker_compose_version in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f9d5ac1c..9e99e489 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ Docker Compose Plugin installation options. These differ from the below in that
 
 ```yaml
 docker_install_compose: false
-docker_compose_version: "2.11.1"
+docker_compose_version: "2.29.2"
 docker_compose_arch: "{{ ansible_architecture }}"
 docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-linux-{{ docker_compose_arch }}"
 docker_compose_path: /usr/local/bin/docker-compose