testing

dev/host_vars/podman.yml

@@ -5,10 +5,14 @@
 allow_reboot: false
 manage_network: false
 
+users:
+  oci:
+    uid: 1001
+    gid: 1001
+
 ################
 #### proxy #####
 ################
-
 proxy:
   servers:
     - domain: cloud.local.krislamo.org
@@ -19,7 +23,7 @@ proxy:
 ################
 
 podman_compose:
-  vagrant:
+  oci:
     root: /opt/oci
     trusted_keys:
       - id: 42A3A92C5DA0F3E5F71A3710105B748C1362EB96
@@ -31,7 +35,7 @@ podman_compose:
         accept_newhostkey: true # Consider verifying manually instead
         env:
           VERSION: latest
-          SOCKET: /run/user/1000/podman/podman.sock
+          SOCKET: /run/user/1001/podman/podman.sock
           DASHBOARD: true
       - name: nextcloud
         url: https://github.com/krislamo/nextcloud

roles/podman/files/docker-host.sh

@@ -1,22 +1,16 @@
-# shellcheck shell=sh
-: "${UID:=$(id -u)}"
-
+# shellcheck shell=bash
 if [ "$UID" -ne 0 ]; then
-	if [ -z "$XDG_RUNTIME_DIR" ] && [ -d "/run/user/$UID" ]; then
+	DOCKER_HOST="unix:///run/user/$UID/podman/podman.sock"
+	export DOCKER_HOST
+
+	if [ -z "${XDG_RUNTIME_DIR:-}" ] && [ -d "/run/user/$UID" ]; then
 		XDG_RUNTIME_DIR="/run/user/$UID"
 		export XDG_RUNTIME_DIR
 	fi
 
-	PODMAN_SOCKET="$XDG_RUNTIME_DIR/podman/podman.sock"
-	if [ -S "$PODMAN_SOCKET" ]; then
-		DOCKER_HOST="unix://$PODMAN_SOCKET"
-		export DOCKER_HOST
-	fi
-
-	if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-		if [ -S "$XDG_RUNTIME_DIR/bus" ]; then
-			DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
-			export DBUS_SESSION_BUS_ADDRESS
-		fi
+	if [ -z "${DBUS_SESSION_BUS_ADDRESS:-}" ] && [ -S "$XDG_RUNTIME_DIR/bus" ];
+	then
+		DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
+		export DBUS_SESSION_BUS_ADDRESS
 	fi
 fi

roles/podman/handlers/main.yml

@@ -1,3 +1,13 @@
+- name: Debug
+  ansible.builtin.debug:
+    msg: "{{ podman_compose | type_debug }}"
+  listen: podman_compose_systemd
+
+- name: Debug full podman_compose variable
+  ansible.builtin.debug:
+    var: podman_compose
+  listen: podman_compose_systemd
+
 - name: Reload systemd manager configuration for all podman users
   ansible.builtin.systemd:
     daemon_reload: true
@@ -7,7 +17,13 @@
   loop: "{{ podman_compose.keys() | list }}"
   listen: podman_compose_systemd
 
-- name: Restart docker compose (podman) services
+- name: Debug full podman_compose_restart variable
+  ansible.builtin.debug:
+    var: podman_compose_restart_list
+  when: podman_compose_restart_list is defined
+  listen: podman_compose_restart
+
+- name: Restart podman-compose services
   ansible.builtin.systemd:
     state: restarted
     name: "compose@{{ item.service }}"
@@ -18,7 +34,7 @@
   when: podman_compose_restart_list is defined
   listen: podman_compose_restart
 
-- name: Start docker compose (podman) services and enable on boot
+- name: Start podman-compose services and enable on boot
   ansible.builtin.systemd:
     name: "compose@{{ item.service }}"
     state: started

roles/podman/tasks/deploy.yml

@@ -12,7 +12,7 @@
     podman_project: "{{ podman_compose_config.compose }}"
     podman_repos: "{{ podman_compose_config.root }}/.compose_repos"
 
-- name: Create docker compose (podman) root directory for user
+- name: Create podman-compose root directory for user
   ansible.builtin.file:
     path: "{{ podman_rootdir }}"
     state: directory
@@ -28,16 +28,16 @@
     group: "{{ podman_user }}"
     mode: "0755"
 
-- name: Install docker compose (podman) systemd service for user
+- name: Install podman-compose systemd service for user
   ansible.builtin.template:
-    src: compose.service.j2
+    src: podman-compose.service.j2
     dest: "/home/{{ podman_user }}/.config/systemd/user/compose@.service"
     owner: "{{ podman_user }}"
     group: "{{ podman_user }}"
     mode: "0644"
   notify: podman_compose_systemd
 
-- name: Create directories for cloning docker compose (podman) repositories
+- name: Create directories for cloning podman-compose repositories
   ansible.builtin.file:
     path: "{{ repo_dir }}"
     state: directory
@@ -63,7 +63,7 @@
     - podman_project is defined
     - podman_project | length > 0
 
-- name: Generate OpenSSH deploy keys for docker compose (podman) clones
+- name: Generate OpenSSH deploy keys for podman-compose clones
   community.crypto.openssh_keypair:
     path: "{{ podman_ssh_key_path }}/podman-id_{{ podman_repos_keytype }}"
     type: "{{ podman_repos_keytype }}"
@@ -74,7 +74,7 @@
     state: present
   when: podman_project is defined
 
-- name: Import trusted GPG keys for docker compose (podman) projects
+- name: Import trusted GPG keys for podman-compose projects
   ansible.builtin.command:
     cmd: "gpg --keyserver {{ key.keyserver | default('keys.openpgp.org') }} --recv-key {{ key.id }}"
   become: true
@@ -86,7 +86,7 @@
   changed_when: false
   when: podman_compose_config.trusted_keys is defined
 
-- name: Clone external docker compose (podman) projects
+- name: Clone external podman-compose projects
   ansible.builtin.git:
     repo: "{{ project.url }}"
     dest: "{{ podman_repos }}/{{ project.name }}"
@@ -116,7 +116,7 @@
     - podman_project is defined
     - podman_project | length > 0
 
-- name: Create directories for docker compose (podman) projects
+- name: Create directories for podman-compose projects
   ansible.builtin.file:
     path: "{{ podman_rootdir }}/{{ project.name }}"
     state: directory
@@ -168,7 +168,7 @@
     path: "{{ podman_rootdir }}/{{ project.name }}/docker-compose.yml"
     owner: "{{ podman_user }}"
     group: "{{ podman_user }}"
-    mode: "0664"
+    mode: "0600"
   loop: "{{ podman_project | default([]) }}"
   loop_control:
     loop_var: project
@@ -177,9 +177,9 @@
     - podman_project is defined
     - podman_project | length > 0
 
-- name: Set environment variables for docker compose (podman) projects
+- name: Set environment variables for podman-compose projects
   ansible.builtin.template:
-    src: compose-env.j2
+    src: podman-compose-env.j2
     dest: "{{ podman_rootdir }}/{{ project.name }}/.env"
     owner: "{{ podman_user }}"
     group: "{{ podman_user }}"

roles/podman/tasks/main.yml

@@ -3,20 +3,12 @@
     name: ["podman", "docker-cli", "docker-compose"]
     state: present
 
-- name: Install GnuPG tools and trusted CA bundle
-  ansible.builtin.apt:
-    name: ["gnupg", "ca-certificates"]
-    state: present
-  when: podman_compose is defined
-
 - name: Get podman user info for user namespace configuration
   ansible.builtin.getent:
     database: passwd
     key: "{{ item }}"
   loop: "{{ podman_compose.keys() | list }}"
   register: user_info
-  loop_control:
-    label: "{{ item }}"
   when: podman_compose is defined
 
 - name: Configure /etc/subuid for rootless users
@@ -31,8 +23,6 @@
     backup: true
     mode: "0644"
   loop: "{{ user_info.results }}"
-  loop_control:
-    label: "{{ item.item }}"
 
 - name: Configure /etc/subgid for rootless users
   ansible.builtin.lineinfile:
@@ -46,16 +36,12 @@
     backup: true
     mode: "0644"
   loop: "{{ user_info.results }}"
-  loop_control:
-    label: "{{ item.item }}"
 
 - name: Enable lingering for podman compose user
   ansible.builtin.command:
     cmd: "loginctl enable-linger {{ item.item }}"
   changed_when: false
   loop: "{{ user_info.results }}"
-  loop_control:
-    label: "{{ item.item }}"
 
 - name: Start and enable the Podman socket
   ansible.builtin.systemd:
@@ -71,8 +57,6 @@
   become: true
   become_user: "{{ item.item }}"
   loop: "{{ user_info.results }}"
-  loop_control:
-    label: "{{ item.item }}"
 
 - name: Create global containers config directory
   ansible.builtin.file: