roles/coturn/tasks/main.yml

@@ -60,22 +60,9 @@
     mode: '640'
   become: true
 
-- name: Pull project services
+- name: Pull/Create/Restart project services
-  community.docker.docker_compose:
-    project_src: "{{ coturn_project_dir }}"
-    recreate: never
-    pull: true
-    debug: true
-  when: docker_pull_images | bool
-  register: coturn_docker_compose_pull_result
-
-- name: Display pulled image(s) name
-  set_fact:
-    coturn_pulled_images: "{{ coturn_pulled_images | default([]) + [item.pulled_image.name] }}"
-  loop: "{{ coturn_docker_compose_pull_result['actions'] | default([]) | selectattr('pulled_image', 'defined') }}"
-
-- name: Create/Restart project services
   community.docker.docker_compose:
     project_src: "{{ coturn_project_dir }}"
+    pull: "{{ docker_pull_images | bool }}"
     # Restart if config file(s) changed
     restarted: "{{ coturn_template_turnserver_result['changed'] | bool }}"

roles/element/tasks/main.yml

@@ -20,22 +20,9 @@
     mode: '644'
   register: element_template_config_result
 
-- name: Pull project services
+- name: Pull/Create/Restart project services
-  community.docker.docker_compose:
-    project_src: "{{ element_project_dir }}"
-    recreate: never
-    pull: true
-    debug: true
-  when: docker_pull_images | bool
-  register: element_docker_compose_pull_result
-
-- name: Display pulled image(s) name
-  set_fact:
-    element_pulled_images: "{{ element_pulled_images | default([]) + [item.pulled_image.name] }}"
-  loop: "{{ element_docker_compose_pull_result['actions'] | default([]) | selectattr('pulled_image', 'defined') }}"
-
-- name: Create/Restart project services
   community.docker.docker_compose:
     project_src: "{{ element_project_dir }}"
+    pull: "{{ docker_pull_images | bool }}"
     # Restart if config file(s) changed
     restarted: "{{ element_template_config_result['changed'] | bool }}"

roles/etebase/tasks/update.yml

@@ -28,26 +28,7 @@
     mode: '770'
   become: true
 
-- name: Pull project services
+- name: Pull/Create/Restart project services
-  community.docker.docker_compose:
-    project_src: "{{ etebase_project_dir }}"
-    recreate: never
-    pull: true
-    debug: true
-  when: docker_pull_images | bool
-  register: etebase_docker_compose_pull_result
-
-- name: Display pulled image(s) name
-  set_fact:
-    etebase_pulled_images: "{{ etebase_pulled_images | default([]) + [item.pulled_image.name] }}"
-  loop: "{{ etebase_docker_compose_pull_result['actions'] | default([]) | selectattr('pulled_image', 'defined') }}"
-
-- name: Include backup tasks
-  include_tasks:
-    file: backup.yml
-  # Make a backup if we didn't already make one and we pulled a new image
-  when: not run_backup and etebase_pulled_images is defined
-
-- name: Create/Restart project services
   community.docker.docker_compose:
     project_src: "{{ etebase_project_dir }}"
+    pull: "{{ docker_pull_images | bool }}"

roles/hedgedoc/tasks/main.yml

@@ -29,20 +29,7 @@
     mode: '770'
   become: true
 
-- name: Pull project services
+- name: Pull/Create/Restart project services
-  community.docker.docker_compose:
-    project_src: "{{ hedgedoc_project_dir }}"
-    recreate: never
-    pull: true
-    debug: true
-  when: docker_pull_images | bool
-  register: hedgedoc_docker_compose_pull_result
-
-- name: Display pulled image(s) name
-  set_fact:
-    hedgedoc_pulled_images: "{{ hedgedoc_pulled_images | default([]) + [item.pulled_image.name] }}"
-  loop: "{{ hedgedoc_docker_compose_pull_result['actions'] | default([]) | selectattr('pulled_image', 'defined') }}"
-
-- name: Create/Restart project services
   community.docker.docker_compose:
     project_src: "{{ hedgedoc_project_dir }}"
+    pull: "{{ docker_pull_images | bool }}"

roles/homepage/tasks/main.yml

@@ -21,22 +21,9 @@
   # Store result to restart services if the file(s) changed
   register: homepage_copy_files_result
 
-- name: Pull project services
+- name: Pull/Create/Restart project services
-  community.docker.docker_compose:
-    project_src: "{{ homepage_project_dir }}"
-    recreate: never
-    pull: true
-    debug: true
-  when: docker_pull_images | bool
-  register: homepage_docker_compose_pull_result
-
-- name: Display pulled image(s) name
-  set_fact:
-    homepage_pulled_images: "{{ homepage_pulled_images | default([]) + [item.pulled_image.name] }}"
-  loop: "{{ homepage_docker_compose_pull_result['actions'] | default([]) | selectattr('pulled_image', 'defined') }}"
-
-- name: Create/Restart project services
   community.docker.docker_compose:
     project_src: "{{ homepage_project_dir }}"
+    pull: "{{ docker_pull_images | bool }}"
     # Restart if config file(s) changed
     restarted: "{{ homepage_copy_files_result['changed'] | bool }}"

roles/searxng/tasks/main.yml

@@ -21,22 +21,9 @@
   # Store result to restart services if the file(s) changed
   register: searxng_copy_files_result
 
-- name: Pull project services
+- name: Pull/Create/Restart project services
-  community.docker.docker_compose:
-    project_src: "{{ searxng_project_dir }}"
-    recreate: never
-    pull: true
-    debug: true
-  when: docker_pull_images | bool
-  register: searxng_docker_compose_pull_result
-
-- name: Display pulled image(s) name
-  set_fact:
-    searxng_pulled_images: "{{ searxng_pulled_images | default([]) + [item.pulled_image.name] }}"
-  loop: "{{ searxng_docker_compose_pull_result['actions'] | default([]) | selectattr('pulled_image', 'defined') }}"
-
-- name: Create/Restart project services
   community.docker.docker_compose:
     project_src: "{{ searxng_project_dir }}"
+    pull: "{{ docker_pull_images | bool }}"
     # Restart if config file(s) changed
     restarted: "{{ searxng_copy_files_result['changed'] | bool }}"

roles/synapse/tasks/update.yml

@@ -45,28 +45,9 @@
     mode: '770'
   become: true
 
-- name: Pull project services
+- name: Pull/Create/Restart project services
-  community.docker.docker_compose:
-    project_src: "{{ synapse_project_dir }}"
-    recreate: never
-    pull: true
-    debug: true
-  when: docker_pull_images | bool
-  register: synapse_docker_compose_pull_result
-
-- name: Display pulled image(s) name
-  set_fact:
-    synapse_pulled_images: "{{ synapse_pulled_images | default([]) + [item.pulled_image.name] }}"
-  loop: "{{ synapse_docker_compose_pull_result['actions'] | default([]) | selectattr('pulled_image', 'defined') }}"
-
-- name: Include backup tasks
-  include_tasks:
-    file: backup.yml
-  # Make a backup if we didn't already make one and we pulled a new image
-  when: not run_backup and synapse_pulled_images is defined
-
-- name: Create/Restart project services
   community.docker.docker_compose:
     project_src: "{{ synapse_project_dir }}"
+    pull: "{{ docker_pull_images | bool }}"
     # Restart if config file(s) changed
     restarted: "{{ synapse_template_homeserver_result['changed'] | bool }}"

roles/syncthing/tasks/main.yml

@@ -11,20 +11,7 @@
     group: "{{ ansible_env['USER'] }}"
     mode: '640'
 
-- name: Pull project services
+- name: Pull/Create/Restart project services
-  community.docker.docker_compose:
-    project_src: "{{ syncthing_project_dir }}"
-    recreate: never
-    pull: true
-    debug: true
-  when: docker_pull_images | bool
-  register: syncthing_docker_compose_pull_result
-
-- name: Display pulled image(s) name
-  set_fact:
-    syncthing_pulled_images: "{{ syncthing_pulled_images | default([]) + [item.pulled_image.name] }}"
-  loop: "{{ syncthing_docker_compose_pull_result['actions'] | default([]) | selectattr('pulled_image', 'defined') }}"
-
-- name: Create/Restart project services
   community.docker.docker_compose:
     project_src: "{{ syncthing_project_dir }}"
+    pull: "{{ docker_pull_images | bool }}"

roles/vaultwarden/tasks/update.yml

@@ -20,26 +20,7 @@
     mode: '770'
   become: true
 
-- name: Pull project services
+- name: Pull/Create/Restart project services
-  community.docker.docker_compose:
-    project_src: "{{ vaultwarden_project_dir }}"
-    recreate: never
-    pull: true
-    debug: true
-  when: docker_pull_images | bool
-  register: vaultwarden_docker_compose_pull_result
-
-- name: Display pulled image(s) name
-  set_fact:
-    vaultwarden_pulled_images: "{{ vaultwarden_pulled_images | default([]) + [item.pulled_image.name] }}"
-  loop: "{{ vaultwarden_docker_compose_pull_result['actions'] | default([]) | selectattr('pulled_image', 'defined') }}"
-
-- name: Include backup tasks
-  include_tasks:
-    file: backup.yml
-  # Make a backup if we didn't already make one and we pulled a new image
-  when: not run_backup and vaultwarden_pulled_images is defined
-
-- name: Create/Restart project services
   community.docker.docker_compose:
     project_src: "{{ vaultwarden_project_dir }}"
+    pull: "{{ docker_pull_images | bool }}"