Refactor docker recreate and rebuild flags

playbooks/tasks/rebuild-service.yml

@@ -0,0 +1,7 @@
+---
+- name: Rebuild service {{ role_name }}
+  ansible.builtin.command:
+    cmd: docker compose build --pull
+    chdir: "{{ (services_path, role_name) | path_join }}"
+  changed_when: true
+  notify: Restart service {{ role_name }}

playbooks/tasks/restart-service.yml

@@ -0,0 +1,7 @@
+---
+- name: "Restart service {{ role_name }}"
+  ansible.builtin.command:
+    cmd: docker compose up -d --force-recreate
+    chdir: "{{ (services_path, role_name) | path_join }}"
+  when: "'local-dev' != inventory_hostname"
+  changed_when: true

playbooks/tasks/set-default-facts.yml

@@ -2,5 +2,3 @@
 - name: Set common facts
   ansible.builtin.set_fact:
     service_path: "{{ (services_path, role_name) | path_join }}"
-    docker_force_recreate: ""
-    docker_rebuild: false

playbooks/tasks/steps/start-service.yml

@@ -1,13 +1,4 @@
 ---
-- name: Rebuild service
-  ansible.builtin.command:
-    cmd: docker compose build --pull
-    chdir: "{{ service_path }}"
-  when:
-    - docker_rebuild
-  register: cmd_result
-  changed_when: true
-
 - name: Build service
   ansible.builtin.command:
     cmd: docker compose build --pull
@@ -16,7 +7,6 @@
     - "'local-dev' != inventory_hostname"
     - docker_update is defined
     - docker_update
-  register: cmd_result
   changed_when: true
 
 - name: Pull service
@@ -27,12 +17,11 @@
     - "'local-dev' != inventory_hostname"
     - docker_update is defined
     - docker_update
-  register: cmd_result
   changed_when: true
 
 - name: Start service
   ansible.builtin.command:
-    cmd: docker compose up -d {{ docker_force_recreate }}
+    cmd: docker compose up -d
     chdir: "{{ service_path }}"
   when: "'local-dev' != inventory_hostname"
   register: cmd_result

playbooks/tasks/steps/template-site-config.yml

@@ -4,5 +4,4 @@
     src: caddy_site.conf.j2
     dest: "{{ (caddy_config_path, role_name + '.conf') | path_join }}"
     mode: "0644"
-  notify:
-    - Reload caddy
+  notify: Reload caddy