fix: arch discovery

refactor repository steps following official docker installation steps

README.md

@@ -1,5 +1,5 @@
 # Ansible Collection
 
-Opinionated set of roles to configure reasonable defaults for newly provisioned Debian / Ubuntu VMs running Docker. The repository provides:
+Opinionated set of roles to configure reasonable defaults for newly provisioned virtual machines. The repository provides a ready-to-use Ansible Collection (`studio.ansible`) containing reusable roles.
-- An Ansible Collection (`studio.ansible`) containing reusable roles. Use with ansible-galaxy's `requirements.yml`.
+
-- A ready-to-use playbook configured by passing CLI vars `--extra-vars "ansible_host=${HOST_IP}` e.g. through CI / CD.
+Currently only supports Debian-based systems.

galaxy.yml

@@ -3,8 +3,9 @@
 namespace: studio
 name: ansible
 readme: README.md
-version: 1.0.0
+version: 0.0.1
 authors:
   - Studio Vitali
 description: Studio Ansible collection containing common roles
-license: MIT
+license:
+  - MIT

inventory/hosts.ini

@@ -1,5 +0,0 @@
-[target]
-target_host ansible_host="{{ ansible_host }}"
-
-[all:vars]
-ansible_user="{{ ansible_user }}"

playbooks/setup.yml

@@ -1,11 +0,0 @@
----
-- name: Setup machines
-  hosts: all
-  become: true
-
-  roles:
-    - base
-    - users
-    - security
-    - docker
-    # - backup

roles/base/tasks/main.yml

@@ -10,7 +10,6 @@
     update_cache: true
     upgrade: dist
     cache_valid_time: 3600
-  when: ansible_facts['os_family'] == "Debian" ## only on Debian / Ubuntu systems
   become: true
 
 - name: Install essential system utilities
@@ -26,7 +25,6 @@
       - unattended-upgrades
     state: present
     update_cache: true
-  when: ansible_facts['os_family'] == "Debian"
   become: true
 #
 # - name: Enable unattended-upgrades

roles/docker/tasks/main.yml

@@ -1,18 +1,58 @@
 ---
-- name: Install necessary Docker packages
+- name: Install Docker prerequisites
   ansible.builtin.apt:
     name:
-      - docker.io
+      - ca-certificates
-      - docker-compose
+      - curl
     state: present
-  when: ansible_facts['os_family'] == "Debian" ## Debian / Ubuntu
+    update_cache: true
   become: true
 
-- name: Ensure Docker service is running
+- name: Ensure APT keyrings directory exists
+  ansible.builtin.file:
+    path: /etc/apt/keyrings
+    state: directory
+    mode: "0755"
+  become: true
+
+- name: Download Docker official GPG key
+  ansible.builtin.get_url:
+    url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg"
+    dest: /etc/apt/keyrings/docker.asc
+    mode: "0644"
+  become: true
+
+- name: Get system architecture
+  ansible.builtin.command: dpkg --print-architecture
+  register: dpkg_architecture
+  changed_when: false
+  become: true
+
+- name: Add Docker official APT repository
+  ansible.builtin.apt_repository:
+    repo: "deb [arch={{ dpkg_architecture.stdout }} signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable"
+    state: present
+    filename: docker
+    update_cache: yes
+  become: true
+
+- name: Install modern Docker CE packages
+  ansible.builtin.apt:
+    name:
+      - docker-ce
+      - docker-ce-cli
+      - containerd.io
+      - docker-buildx-plugin
+      - docker-compose-plugin
+    state: present
+  become: true
+
+- name: Ensure Docker services are running and enabled
   ansible.builtin.service:
     name: docker
     state: started
     enabled: true
+  become: true
 
 - name: Create docker user for container execution
   ansible.builtin.user:
@@ -25,6 +65,13 @@
     create_home: false
   become: true
 
+- name: Add deployment user to docker group
+  ansible.builtin.user:
+    name: deployment
+    groups: docker
+    append: true
+  become: true
+
 - name: Create target for docker compose
   ansible.builtin.file:
     path: /opt/docker

roles/security/handlers/main.yml

@@ -1,5 +1,5 @@
 ---
 - name: Restart sshd
   ansible.builtin.service:
-    name: sshd
+    name: ssh
     state: restarted

roles/security/tasks/main.yml

@@ -24,7 +24,6 @@
     name:
       - fail2ban
     state: present
-  when: ansible_facts['os_family'] == "Debian"
   become: true
 
 - name: Start fail2ban
@@ -32,4 +31,3 @@
     name: fail2ban
     state: started
     enabled: yes
-  when: ansible_facts['os_family'] == "Debian"