From 06b673ec89cab327f634a79134a89862045232e8 Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Fri, 9 Jun 2023 00:42:43 +0200
Subject: [PATCH] Apply ansible-lint fixes

---
 ansible/playbooks/misc-docker.yaml            | 6 +++---
 ansible/roles/docker/tasks/main.yaml          | 4 ++--
 ansible/roles/docker/templates/docker.list.j2 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ansible/playbooks/misc-docker.yaml b/ansible/playbooks/misc-docker.yaml
index 0775465..73e21e3 100644
--- a/ansible/playbooks/misc-docker.yaml
+++ b/ansible/playbooks/misc-docker.yaml
@@ -35,7 +35,7 @@
     # All services that are behind Caddy need to be in this network
     - name: Create Caddy network
       become: true
-      docker_network:
+      community.docker.docker_network:
         name: caddy-network
         state: present
     - name: Upload docker configuration
@@ -107,7 +107,7 @@
     # that Gitea is reachable before those configurations are deployed.
     - name: Set up caddy and gitea containers
       become: true
-      docker_compose:
+      community.docker.docker_compose:
         project_src: "/etc/pbri/docker/{{ item.name }}"
         state: "{{ item.state }}"
         build: true
@@ -130,7 +130,7 @@
       delay: 5  # Retry every 5 seconds
     - name: Set up other containers
       become: true
-      docker_compose:
+      community.docker.docker_compose:
         project_src: "/etc/pbri/docker/{{ item.name }}"
         state: "{{ item.state }}"
         build: true
diff --git a/ansible/roles/docker/tasks/main.yaml b/ansible/roles/docker/tasks/main.yaml
index ee75aff..03f9904 100644
--- a/ansible/roles/docker/tasks/main.yaml
+++ b/ansible/roles/docker/tasks/main.yaml
@@ -28,7 +28,7 @@
 - name: Retrieve dpkg architecture
   check_mode: false
   ansible.builtin.command: dpkg --print-architecture
-  register: dpkg_architecture
+  register: docker_dpkg_architecture
   changed_when: false
 
 - name: Add Docker apt repository
@@ -36,7 +36,7 @@
   ansible.builtin.template:
     src: docker.list.j2
     dest: /etc/apt/sources.list.d/docker.list
-    mode: 0644
+    mode: "u=rw,g=r,o=r"
 
 - name: Install Docker
   become: true
diff --git a/ansible/roles/docker/templates/docker.list.j2 b/ansible/roles/docker/templates/docker.list.j2
index e8c0e30..b4288d5 100644
--- a/ansible/roles/docker/templates/docker.list.j2
+++ b/ansible/roles/docker/templates/docker.list.j2
@@ -1 +1 @@
-deb [arch={{ dpkg_architecture.stdout }} signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable
+deb [arch={{ docker_dpkg_architecture.stdout }} signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable