Add support for Debian 13 - Trixie

roles/docker/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-# Remove conflicting packages (per Docker docs)
+# Remove conflicting packages
 - name: Remove conflicting Docker packages
   apt:
     name:
@@ -29,10 +29,10 @@
     state: directory
     mode: "0755"
 
-# Docker GPG key (must be dearmored for apt signed-by)
+# Docker GPG key
 - name: Add Docker GPG key
   shell: |
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+    curl -fsSL https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
   args:
     creates: /etc/apt/keyrings/docker.gpg
 
@@ -41,17 +41,17 @@
   apt_repository:
     repo: >
       deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg]
-      https://download.docker.com/linux/ubuntu
+      https://download.docker.com/linux/{{ ansible_distribution | lower }}
       {{ ansible_distribution_release }} stable
     filename: docker
     state: present
+    update_cache: true
 
 # Install Docker
 - name: Install Docker Engine and plugins
   apt:
     name: "{{ docker_packages }}"
     state: present
-    update_cache: true
 
 # Docker daemon configuration
 - name: Configure Docker daemon
@@ -73,11 +73,11 @@
 # Non-root Docker usage
 - name: Add user to docker group
   user:
-    name: "{{ ansible_user }}"
+    name: "{{ docker_manage_user | default(ansible_user) }}"
     groups: docker
     append: true
 
-# Kernel forwarding (required)
+# Kernel forwarding
 - name: Enable IP forwarding
   sysctl:
     name: net.ipv4.ip_forward
@@ -86,7 +86,7 @@
     reload: true
 
 # Optional IPv6 disable
-- name: Disable IPv6 (optional)
+- name: Disable IPv6
   sysctl:
     name: "{{ item }}"
     value: "1"
@@ -95,4 +95,4 @@
   loop:
     - net.ipv6.conf.all.disable_ipv6
     - net.ipv6.conf.default.disable_ipv6
-  when: docker_disable_ipv6
+  when: docker_disable_ipv6