feat(install-docker.yml): fix repo add + install pkgs + project structure

deploy/docker-install.yml

@@ -1,37 +0,0 @@
-- name: Installing Docker and Docker Compose
-  hosts: hosts
-
-  tasks:
-  - name: Clear previous install of Docker
-    ansible.builtin.apt: 
-      pkg:
-        - docker.io
-        - docker-compose
-        - docker-compose-v2
-        - docker-doc
-        - podman-docker
-        - containerd
-      state: absent
-      autoremove: true
-
-  - name: Install pre-requirements
-    ansible.builtin.apt:
-      update_cache: yes
-      pkg:
-        - ca-certificates
-        - curl
-
-  - name: Add Docker GPG key and Repository
-    become: true
-    block:
-      - name: somerepo | no apt key
-        ansible.builtin.get_url:
-          url: https://download.docker.com/linux/ubuntu/gpg
-          dest: /etc/apt/keyrings/docker.asc
-
-      - name: somerepo | apt source
-        ansible.builtin.apt_repository:
-          repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
-          state: present
-  
-  

install-docker.yml

@@ -0,0 +1,61 @@
+- name: Installing Docker and Docker Compose
+  hosts: hosts
+  become: true
+
+  tasks:
+  - name: Clear previous install of Docker
+    ansible.builtin.apt: 
+      name:
+        - docker.io
+        - docker-compose
+        - docker-compose-v2
+        - docker-doc
+        - podman-docker
+        - containerd
+      state: absent
+      autoremove: true
+      force: true
+
+  - name: Install pre-requirements
+    ansible.builtin.apt:
+      update_cache: yes
+      pkg:
+        - ca-certificates
+        - curl
+      force: true
+
+  - name: Add Docker GPG key and Repository
+    block:
+      - name: Download GPG Key
+        ansible.builtin.get_url:
+          url: https://download.docker.com/linux/ubuntu/gpg
+          dest: /etc/apt/keyrings/docker.asc
+
+      - name: Add Docker repository source
+        ansible.builtin.template:
+          src: docker.sources.j2
+          dest: /etc/apt/sources.list.d/docker.sources
+          owner: root
+          group: root
+          mode: '0644'
+
+      - name: Update apt cache after adding Docker repository
+        ansible.builtin.apt:
+          update_cache: yes
+
+      - name: Install Docker and Docker Compose
+        ansible.builtin.apt:
+          state: present
+          name:
+            - docker-ce
+            - docker-ce-cli
+            - containerd.io
+            - docker-buildx-plugin
+            - docker-compose-plugin
+          force: true
+
+  - name: Add ubuntu user to docker group
+    ansible.builtin.user:
+      name: "{{ ansible_user_id }}"
+      groups: docker
+      append: yes

inventory/local.yml

@@ -1,4 +1,3 @@
-
 hosts:
   hosts:
     127.0.0.1:

playbook.yml

@@ -0,0 +1 @@
+- import_playbook: ./playbooks/install-docker.yml

templates/docker.sources.j2

@@ -0,0 +1,5 @@
+Types: deb
+URIs: https://download.docker.com/linux/ubuntu
+Suites: {{ ansible_distribution_release }}
+Components: stable
+Signed-By: /etc/apt/keyrings/docker.asc