Add watchtower to ansible

_ansible/inventory/group_vars/all/compose_defaults.yml

@@ -1,4 +1,4 @@
-compose_default_file:
+compose_file_main:
   services:
     app:
       image: "{{ compose.image }}"
@@ -13,8 +13,18 @@ compose_default_file:
     apps:
       external: true
 
-compose_env_file:
+compose_file_env:
   services:
     app:
       env_file:
         - service.env
+
+compose_file_ports:
+  services:
+    app:
+      ports: "{{ compose.ports }}"
+
+compose_file_volumes:
+  services:
+    app:
+      volumes: "{{ compose.volumes }}"

_ansible/inventory/group_vars/all/main.yml

@@ -4,5 +4,10 @@ postgres:
   host: db.serguzim.me
   port: 5432
 
+mailer:
+  host: mail.serguzim.me
+  port: 587
+
+
 services_path: /opt/services/
 caddy_config_path: "{{ (services_path, 'caddy', 'config', 'conf.d') | path_join }}"

_ansible/local-dev.yml

@@ -10,3 +10,4 @@
     - acme-dns
     - gitea
     - umami
+    - watchtower

_ansible/node002.yml

@@ -5,3 +5,4 @@
     - acme-dns
     - gitea
     - umami
+    - watchtower

_ansible/roles/acme-dns/vars/main.yml

@@ -16,11 +16,8 @@ svc:
 compose:
   watchtower: true
   image: joohoi/acme-dns
-  file:
-    services:
-      app:
-        ports:
-          - "53:53"
-          - "53:53/udp"
-        volumes:
-          - ./config:/etc/acme-dns:ro
+  ports:
+    - "53:53"
+    - "53:53/udp"
+  volumes:
+    - ./config:/etc/acme-dns:ro

_ansible/roles/gitea/vars/main.yml

@@ -78,16 +78,14 @@ compose:
   watchtower: true
   image: gitea/gitea:1.19
   env: true
+  volumes:
+    - data:/data
+    - /etc/timezone:/etc/timezone:ro
+    - /etc/localtime:/etc/localtime:ro
+  ports:
+    - "{{ svc.ssh_port }}:{{ svc.ssh_port }}"
+    - "{{ svc.ssh_port_alt }}:{{ svc.ssh_port }}"
   file:
-    services:
-      app:
-        volumes:
-          - data:/data
-          - /etc/timezone:/etc/timezone:ro
-          - /etc/localtime:/etc/localtime:ro
-        ports:
-          - "{{ svc.ssh_port }}:{{ svc.ssh_port }}"
-          - "{{ svc.ssh_port_alt }}:{{ svc.ssh_port }}"
     volumes:
       data:
 

_ansible/templates/docker-compose.yml.j2

@@ -1,6 +1,16 @@
-{% set compose_file = compose.file | default({}) %}
-{% set compose_file = compose_default_file | combine(compose_file, recursive=True) %}
-{% if compose.env | default(False) %}
-{% set compose_file = compose_file | combine(compose_env_file, recursive=True) %}
-{% endif %}
+{%- set compose_file = compose.file | default({}) -%}
+{%- set compose_file = compose_file_main | combine(compose_file, recursive=True) -%}
+
+{%- if compose.env | default(False) -%}
+    {%- set compose_file = compose_file | combine(compose_file_env, recursive=True) -%}
+{%- endif -%}
+
+{%- if compose.ports | default(False) -%}
+    {%- set compose_file = compose_file | combine(compose_file_ports, recursive=True) -%}
+{%- endif -%}
+
+{%- if compose.volumes | default(False) -%}
+    {%- set compose_file = compose_file | combine(compose_file_volumes, recursive=True) -%}
+{%- endif -%}
+
 {{ compose_file | to_nice_yaml }}