testing

Vagrantfile

@@ -9,7 +9,7 @@ if File.exist?(settings_path)
   settings = YAML.load_file(settings_path)
 end
 
-VAGRANT_BOX  = settings['VAGRANT_BOX']  || 'debian/bookworm64'
+VAGRANT_BOX  = settings['VAGRANT_BOX']  || 'krislamo.org/debian13'
 VAGRANT_CPUS = settings['VAGRANT_CPUS'] || 2
 VAGRANT_MEM  = settings['VAGRANT_MEM']  || 2048
 SSH_FORWARD  = settings['SSH_FORWARD']  || false

dev/host_vars/podman.yml

@@ -6,41 +6,44 @@ allow_reboot: false
 manage_network: false
 
 users:
-  kris:
+  oci:
     uid: 1001
     gid: 1001
-    home: true
-    ansible_temp: true
+
+################
+#### proxy #####
+################
+proxy:
+  servers:
+    - domain: cloud.local.krislamo.org
+      proxy_pass: http://127.0.0.1:8000
 
 ################
 #### podman ####
 ################
 
-user_namespaces:
-  - kris
-
-podman_compose_deploy:
-  kris:
-    root: /home/kris/podman_root
+podman_compose:
+  oci:
+    root: /opt/oci
     trusted_keys:
-      - id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-        keyserver: keyserver.ubuntu.com
+      - id: 42A3A92C5DA0F3E5F71A3710105B748C1362EB96
     compose:
       - name: traefik
         url: https://github.com/krislamo/traefik
-        version: d62bd06b37ecf0993962b0449a9d708373f9e381
+        version: d7197ddd5b7019c60faf5d164e555b6374972d40
         enabled: true
         accept_newhostkey: true # Consider verifying manually instead
         env:
+          VERSION: latest
+          SOCKET: /run/user/1001/podman/podman.sock
           DASHBOARD: true
-
-###################
-#### Bitwarden ####
-###################
-
-# Get Installation ID & Key at https://bitwarden.com/host/
-bitwarden_domain: vault.local.krislamo.org
-bitwarden_dbpass: password
-bitwarden_install_id: 4ea840a3-532e-4cb6-a472-abd900728b23
-bitwarden_install_key: 1yB3Z2gRI0KnnH90C6p
-#bitwarden_prodution: true
+      - name: nextcloud
+        url: https://github.com/krislamo/nextcloud
+        version: 245c91a22fa75e5dde1d423e88540529a4fa4f27
+        enabled: true
+        env:
+          VERSION: latest
+          DOMAIN: cloud.local.krislamo.org
+          DATA: /opt/oci/nextcloud/data/
+          REDIS_VERSION: latest
+          REDIS_PASSWORD: changeme

dev/podman.yml

@@ -5,5 +5,5 @@
     - host_vars/podman.yml
   roles:
     - base
+    - proxy
     - podman
-    - bitwarden

roles/base/tasks/system.yml

@@ -102,7 +102,7 @@
     label: "{{ item.key }}"
   when:
     - users is defined
-    - item.value.ansible_temp | default(false)
+    - item.value.tmp | default(true)
 
 - name: Set authorized_keys for system users
   ansible.posix.authorized_key:

roles/docker/tasks/main.yml

@@ -101,6 +101,7 @@
   loop_control:
     label: "{{ item.url }}"
   when: docker_compose_deploy is defined
+  tags: docker
 
 - name: Create directories for docker-compose projects using the systemd service
   ansible.builtin.file:
@@ -111,6 +112,7 @@
   loop_control:
     label: "{{ item.name }}"
   when: docker_compose_deploy is defined
+  tags: docker
 
 - name: Synchronize docker-compose.yml
   ansible.posix.synchronize:
@@ -125,6 +127,7 @@
   loop_control:
     label: "{{ item.name }}"
   when: docker_compose_deploy is defined and docker_compose_deploy | length > 0
+  tags: docker
 
 - name: Set environment variables for docker-compose projects
   ansible.builtin.template:
@@ -140,6 +143,7 @@
   loop_control:
     label: "{{ item.name }}"
   when: docker_compose_deploy is defined and item.env is defined
+  tags: docker
 
 - name: Start Docker and enable on boot
   ansible.builtin.service:

roles/nextcloud/tasks/main.yml

@@ -23,7 +23,7 @@
     name: "{{ docker_compose_service }}@{{ nextcloud_name }}"
     state: started
     enabled: true
-  when: nextcloud.ENABLE | default('false')
+  when: nextcloud.ENABLE | default(false)
 
 - name: Grab Nextcloud container information
   community.general.docker_container_info:

roles/podman/files/docker-host.sh

@@ -0,0 +1,16 @@
+# shellcheck shell=bash
+if [ "$UID" -ne 0 ]; 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
+
+	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,37 +1,32 @@
-- name: Reload systemd manager configuration
+- 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
     scope: user
   become: true
-  become_user: "{{ podman_user }}"
+  become_user: "{{ item }}"
+  loop: "{{ podman_compose.keys() | list }}"
   listen: podman_compose_systemd
 
-- name: Find which services had a podman-compose.yml updated
-  ansible.builtin.set_fact:
-    podman_compose_restart_list:
-      "{{ (podman_compose_restart_list | default([])) + [{'user': podman_user,
-      'service': item.item.name}] }}"
-  loop: "{{ podman_compose_update.results }}"
-  loop_control:
-    label: "{{ podman_user }}/{{ item.item.name }}"
-  when: item.changed
-  listen: podman_compose_restart
-
-- name: Find which services had their .env updated
-  ansible.builtin.set_fact:
-    podman_compose_restart_list:
-      "{{ (podman_compose_restart_list | default([])) + [{'user': podman_user,
-      'service': item.item.name}] }}"
-  loop: "{{ podman_compose_env_update.results }}"
-  loop_control:
-    label: "{{ podman_user }}/{{ item.item.name }}"
-  when: item.changed
+- 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: "podman-compose@{{ item.service }}"
+    name: "compose@{{ item.service }}"
     scope: user
   become: true
   become_user: "{{ item.user }}"
@@ -41,14 +36,14 @@
 
 - name: Start podman-compose services and enable on boot
   ansible.builtin.systemd:
-    name: "podman-compose@{{ item.name }}"
+    name: "compose@{{ item.service }}"
     state: started
     enabled: true
     scope: user
   become: true
-  become_user: "{{ podman_user }}"
-  loop: "{{ podman_compose }}"
+  become_user: "{{ item.user }}"
+  loop: "{{ podman_compose_enable_list | default([]) }}"
   loop_control:
-    label: "{{ podman_user }}/{{ item.name }}"
+    label: "{{ item.user }}/{{ item.service }}"
   when: item.enabled is defined and item.enabled is true
   listen: podman_compose_enable

roles/podman/tasks/deploy.yml

@@ -8,7 +8,8 @@
   ansible.builtin.set_fact:
     podman_rootdir: "{{ podman_compose_config.root }}"
     podman_userid: "{{ podman_user_info.ansible_facts.getent_passwd[podman_user][1] }}"
-    podman_compose: "{{ podman_compose_config.compose }}"
+    podman_homedir: "{{ podman_user_info.ansible_facts.getent_passwd[podman_user][4] }}"
+    podman_project: "{{ podman_compose_config.compose }}"
     podman_repos: "{{ podman_compose_config.root }}/.compose_repos"
 
 - name: Create podman-compose root directory for user
@@ -30,7 +31,7 @@
 - name: Install podman-compose systemd service for user
   ansible.builtin.template:
     src: podman-compose.service.j2
-    dest: "/home/{{ podman_user }}/.config/systemd/user/podman-compose@.service"
+    dest: "/home/{{ podman_user }}/.config/systemd/user/compose@.service"
     owner: "{{ podman_user }}"
     group: "{{ podman_user }}"
     mode: "0644"
@@ -48,19 +49,19 @@
   loop_control:
     loop_var: repo_dir
   when:
-    - podman_compose is defined
-    - podman_compose | length > 0
+    - podman_project is defined
+    - podman_project | length > 0
 
 - name: Create .ssh directory for podman compose user
   ansible.builtin.file:
-    path: "{{ podman_ssh_key_path }}"
+    path: "{{ podman_homedir }}/.ssh"
     state: directory
     owner: "{{ podman_user }}"
     group: "{{ podman_user }}"
     mode: "0700"
   when:
-    - podman_compose is defined
-    - podman_compose | length > 0
+    - podman_project is defined
+    - podman_project | length > 0
 
 - name: Generate OpenSSH deploy keys for podman-compose clones
   community.crypto.openssh_keypair:
@@ -71,7 +72,7 @@
     group: "{{ podman_user }}"
     mode: "0600"
     state: present
-  when: podman_compose is defined
+  when: podman_project is defined
 
 - name: Import trusted GPG keys for podman-compose projects
   ansible.builtin.command:
@@ -91,21 +92,29 @@
     dest: "{{ podman_repos }}/{{ project.name }}"
     version: "{{ project.version }}"
     accept_newhostkey: "{{ project.accept_newhostkey | default(false) }}"
-    gpg_whitelist: "{{ (project.trusted_keys | default(podman_compose_config.trusted_keys | default([]))) | map(attribute='id') | list }}"
+    gpg_allowlist: "{{ (project.trusted_keys |
+      default(podman_compose_config.trusted_keys | default([]))) |
+      map(attribute='id') | list }}"
     verify_commit: >-
-      {{ true if (project.trusted_keys is defined and project.trusted_keys) or
-         (podman_compose_config.trusted_keys is defined and podman_compose_config.trusted_keys)
-         else false }}
+      {{
+        true if
+        (project.trusted_keys is defined and project.trusted_keys) or
+        (
+          podman_compose_config.trusted_keys is defined and
+          podman_compose_config.trusted_keys
+        )
+        else false
+      }}
     key_file: "{{ podman_ssh_key_path }}/podman-id_{{ podman_repos_keytype }}"
   become: true
   become_user: "{{ podman_user }}"
-  loop: "{{ podman_compose }}"
+  loop: "{{ podman_project }}"
   loop_control:
     loop_var: project
     label: "{{ project.url }}"
   when:
-    - podman_compose is defined
-    - podman_compose | length > 0
+    - podman_project is defined
+    - podman_project | length > 0
 
 - name: Create directories for podman-compose projects
   ansible.builtin.file:
@@ -114,17 +123,20 @@
     owner: "{{ podman_user }}"
     group: "{{ podman_user }}"
     mode: "0700"
-  loop: "{{ podman_compose }}"
+  loop: "{{ podman_project }}"
   loop_control:
     loop_var: project
     label: "{{ project.name }}"
   when:
-    - podman_compose is defined
-    - podman_compose | length > 0
+    - podman_project is defined
+    - podman_project | length > 0
 
-- name: Synchronize podman-compose.yml (or docker-compose.yml)
+- name: Synchronize docker-compose.yml
   ansible.posix.synchronize:
-    src: "{{ podman_repos }}/{{ project.name }}/{{ project.path | default('docker-compose.yml') }}"
+    # noqa jinja[spacing]
+    src: >-
+      {{ podman_repos }}/{{ project.name }}/
+      {{- project.path | default('docker-compose.yml') }}
     dest: "{{ podman_rootdir }}/{{ project.name }}/docker-compose.yml"
     owner: false
     group: false
@@ -133,13 +145,23 @@
   notify:
     - podman_compose_restart
     - podman_compose_enable
-  loop: "{{ podman_compose | default([]) }}"
+  loop: "{{ podman_project | default([]) }}"
   loop_control:
     loop_var: project
     label: "{{ project.name }}"
   when:
-    - podman_compose is defined
-    - podman_compose | length > 0
+    - podman_project is defined
+    - podman_project | length > 0
+
+- name: Update list of compose projects updated
+  ansible.builtin.set_fact:
+    podman_compose_restart_list:
+      "{{ (podman_compose_restart_list | default([])) +
+      [{'user': podman_user, 'service': item.project.name}] }}"
+  loop: "{{ podman_compose_update.results }}"
+  loop_control:
+    label: "{{ podman_user }}/{{ item.project.name }}"
+  when: (podman_compose_update.results | default([]) | length) > 0
 
 - name: Fix ownership of synchronized compose files
   ansible.builtin.file:
@@ -147,13 +169,13 @@
     owner: "{{ podman_user }}"
     group: "{{ podman_user }}"
     mode: "0600"
-  loop: "{{ podman_compose | default([]) }}"
+  loop: "{{ podman_project | default([]) }}"
   loop_control:
     loop_var: project
     label: "{{ project.name }}"
   when:
-    - podman_compose is defined
-    - podman_compose | length > 0
+    - podman_project is defined
+    - podman_project | length > 0
 
 - name: Set environment variables for podman-compose projects
   ansible.builtin.template:
@@ -167,16 +189,31 @@
     - podman_compose_restart
     - podman_compose_enable
   no_log: true
-  loop: "{{ podman_compose }}"
+  loop: "{{ podman_project }}"
   loop_control:
     loop_var: project
     label: "{{ project.name }}"
-  when: podman_compose is defined and project.env is defined
+  when: podman_project is defined and project.env is defined
 
-- name: Enable lingering for podman compose user
-  ansible.builtin.command:
-    cmd: "loginctl enable-linger {{ podman_user }}"
-  changed_when: false
-  when:
-    - podman_compose is defined
-    - podman_compose | length > 0
+- name: Update list of compose projects who updated their .env
+  ansible.builtin.set_fact:
+    # noqa jinja[spacing]
+    podman_compose_restart_list: "{{
+      (podman_compose_restart_list | default([]))
+      + ([{'user': podman_user,'service': item.project.name}]
+      if {'user': podman_user, 'service': item.project.name}
+      not in (podman_compose_restart_list | default([]))
+      else [])
+      }}"
+  loop: "{{ podman_compose_env_update.results }}"
+  loop_control:
+    label: "{{ podman_user }}/{{ item.project.name }}"
+  when: (podman_compose_env_update.results | default([]) | length) > 0
+
+- name: Update list of enabled compose projects
+  ansible.builtin.set_fact:
+    podman_compose_enable_list: >-
+      {{ (podman_compose_enable_list | default([]))
+         + [{'user': podman_user, 'service': project.name}] }}
+  when: project.enabled | default(false)
+  notify: podman_compose_enable

roles/podman/tasks/main.yml

@@ -1,14 +1,15 @@
-- name: Install Podman
+- name: Install Podman with Docker CLI tools
   ansible.builtin.apt:
-    name: ["podman", "podman-compose", "podman-docker"]
+    name: ["podman", "docker-cli", "docker-compose"]
     state: present
 
-- name: Get user info for namespace users
+- name: Get podman user info for user namespace configuration
   ansible.builtin.getent:
     database: passwd
     key: "{{ item }}"
-  loop: "{{ user_namespaces }}"
+  loop: "{{ podman_compose.keys() | list }}"
   register: user_info
+  when: podman_compose is defined
 
 - name: Configure /etc/subuid for rootless users
   ansible.builtin.lineinfile:
@@ -36,14 +37,26 @@
     mode: "0644"
   loop: "{{ user_info.results }}"
 
-- name: Create nodocker file to disable Docker CLI emulation message
-  ansible.builtin.file:
-    path: /etc/containers/nodocker
-    state: touch
-    owner: root
-    group: root
-    mode: "0644"
-  when: podman_nodocker | bool
+- name: Enable lingering for podman compose user
+  ansible.builtin.command:
+    cmd: "loginctl enable-linger {{ item.item }}"
+  changed_when: false
+  loop: "{{ user_info.results }}"
+
+- name: Start and enable the Podman socket
+  ansible.builtin.systemd:
+    name: podman.socket
+    state: started
+    enabled: true
+    scope: user
+  vars:
+    uid: "{{ item.ansible_facts.getent_passwd[item.item][1] }}"
+  environment:
+    XDG_RUNTIME_DIR: "/run/user/{{ uid }}"
+    DBUS_SESSION_BUS_ADDRESS: "unix:path=/run/user/{{ uid }}/bus"
+  become: true
+  become_user: "{{ item.item }}"
+  loop: "{{ user_info.results }}"
 
 - name: Create global containers config directory
   ansible.builtin.file:
@@ -59,19 +72,29 @@
       events_logger = "journald"
       runtime = "crun"
     dest: /etc/containers/containers.conf
-    mode: "0644"
     backup: true
+    mode: "0644"
+
+- name: Configure Docker CLI to use rootless Podman socket
+  ansible.builtin.copy:
+    src: files/docker-host.sh
+    dest: /etc/profile.d/docker-host.sh
+    owner: root
+    group: root
+    mode: '0755'
 
 - name: Install git for repository cloning
   ansible.builtin.apt:
     name: git
     state: present
-  when: podman_compose_deploy is defined
+  when: podman_compose is defined
 
 - name: Deploy Podman compose projects for each user
   ansible.builtin.include_tasks: deploy.yml
   vars:
-    podman_user: "{{ item.key }}"
-    podman_compose_config: "{{ item.value }}"
-  loop: "{{ podman_compose_deploy | dict2items }}"
-  when: podman_compose_deploy is defined
+    podman_user: "{{ compose_user.key }}"
+    podman_compose_config: "{{ compose_user.value }}"
+  loop: "{{ podman_compose | dict2items }}"
+  loop_control:
+    loop_var: compose_user
+  when: podman_compose is defined

roles/podman/templates/podman-compose-env.j2

@@ -1,6 +1,6 @@
 # {{ ansible_managed }}
-{% if item.env is defined %}
-{% for key, value in item.env.items() %}
+{% if project.env is defined %}
+{% for key, value in project.env.items() %}
 {% if value is boolean %}
 {{ key }}={{ value | lower }}
 {% else %}

roles/podman/templates/podman-compose.service.j2

@@ -1,17 +1,15 @@
 [Unit]
-Description=%i podman-compose service for {{ podman_user }}
-After=network-online.target
-Wants=network-online.target
+Description=%i docker compose (podman) service
+Requires=podman.socket
+After=podman.socket
 
 [Service]
 Type=oneshot
 RemainAfterExit=true
 WorkingDirectory={{ podman_rootdir }}/%i
-ExecStart=/usr/bin/podman-compose up -d --remove-orphans
-ExecStop=/usr/bin/podman-compose down
-Environment="PODMAN_USERNS=keep-id"
-Environment="PODMAN_SOCKET_PATH=/run/user/{{ podman_userid }}/podman/podman.sock"
-TimeoutStartSec=0
+Environment=DOCKER_HOST=unix://%t/podman/podman.sock
+ExecStart=/usr/bin/docker compose up -d --remove-orphans
+ExecStop=/usr/bin/docker compose down
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target

roles/traefik/tasks/main.yml

@@ -33,4 +33,4 @@
     name: "{{ docker_compose_service }}@{{ traefik_name }}"
     state: started
     enabled: true
-  when: traefik.ENABLED | default('false')
+  when: traefik.ENABLED | default(false)