From b227385ae58a284ac650c8908c59d1ddcbdf2ec3 Mon Sep 17 00:00:00 2001
From: "Tobias J. Endres" <tobend85@gmail.com>
Date: Tue, 2 Sep 2025 18:06:19 +0200
Subject: [PATCH] feat: Revert playbook to focus on network role for Scully and
 add podman role

---
 playbooks/main.yml                    |  2 +-
 playbooks/roles/docker/tasks/main.yml | 27 ++++++++++++++++++---------
 playbooks/roles/podman/tasks/main.yml | 10 ++++++++++
 3 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 playbooks/roles/podman/tasks/main.yml

diff --git a/playbooks/main.yml b/playbooks/main.yml
index b210962..a556bec 100644
--- a/playbooks/main.yml
+++ b/playbooks/main.yml
@@ -3,4 +3,4 @@
   become: true
   roles:
     - common
-    - network
+    - network
\ No newline at end of file
diff --git a/playbooks/roles/docker/tasks/main.yml b/playbooks/roles/docker/tasks/main.yml
index e57359c..1c6aac8 100644
--- a/playbooks/roles/docker/tasks/main.yml
+++ b/playbooks/roles/docker/tasks/main.yml
@@ -17,21 +17,30 @@
       - curl
     state: present
 
-- name: Download Docker repository key securely
-  become: true
-  get_url:
-    url: https://download.docker.com/linux/ubuntu/gpg
-    dest: /etc/apt/keyrings/docker.asc
-    mode: '0644'
-    force: true  # Ensures updates if the key changes
+- name: Add Docker's official GPG key
+  shell: |
+    sudo install -m 0755 -d /etc/apt/keyrings
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+    sudo chmod a+r /etc/apt/keyrings/docker.gpg
+  args:
+    creates: /etc/apt/keyrings/docker.gpg
 
 - name: Add Docker repository
   become: true
   apt_repository:
-    repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
+    repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
     state: present
     update_cache: true
 
+- name: Read docker sources list
+  slurp:
+    src: /etc/apt/sources.list.d/download_docker_com_linux_ubuntu.list
+  register: docker_sources_list
+
+- name: Display docker sources list
+  debug:
+    var: docker_sources_list.content | b64decode
+
 - name: Install Docker and related components
   become: true
   apt:
@@ -54,4 +63,4 @@
   service:
     name: docker
     state: started
-    enabled: true
+    enabled: true
\ No newline at end of file
diff --git a/playbooks/roles/podman/tasks/main.yml b/playbooks/roles/podman/tasks/main.yml
new file mode 100644
index 0000000..e3fad53
--- /dev/null
+++ b/playbooks/roles/podman/tasks/main.yml
@@ -0,0 +1,10 @@
+---
+- name: Install Podman
+  ansible.builtin.apt:
+    name: podman
+    state: present
+
+- name: Install podman-docker (optional, for docker command alias)
+  ansible.builtin.apt:
+    name: podman-docker
+    state: present