updates: prepare for upgrade to debian 12

roles/alpina/collections/apps/arrstack/templates/docker-compose.yml.j2

@@ -1,6 +1,4 @@
 {% import 'contrib/compose_helpers.j2' as helpers with context %}
-{##}
-version: "3.9"
 
 networks:
   {{ helpers.default_network(249) | indent(2) }}

roles/alpina/collections/apps/gitea/templates/docker-compose.yml.j2

@@ -1,6 +1,4 @@
 {% import 'contrib/compose_helpers.j2' as helpers with context %}
-{##}
-version: "3.9"
 
 networks:
   {{ helpers.default_network(199) | indent(2) }}

roles/alpina/collections/apps/jellyfin/templates/docker-compose.yml.j2

@@ -1,6 +1,4 @@
 {% import 'contrib/compose_helpers.j2' as helpers with context %}
-{##}
-version: "3.9"
 
 networks:
   {{ helpers.default_network(197) | indent(2) }}

roles/alpina/collections/apps/nextcloud/templates/.env.nextcloud.j2

@@ -17,7 +17,7 @@ SMTP_PASSWORD={{ sendgrid_api_key }}
 MAIL_FROM_ADDRESS=nc
 MAIL_DOMAIN=cazzzer.com
 
-TRUSTED_PROXIES={{ traefik_ip }}
+TRUSTED_PROXIES={{ traefik_subnet }}
 OVERWRITEHOST=nc.{{ domain }}
 OVERWRITEPROTOCOL=https
 OVERWRITECLIURL=https://nc.{{ domain }}

roles/alpina/collections/apps/nextcloud/templates/docker-compose.yml.j2

@@ -1,6 +1,4 @@
 {% import 'contrib/compose_helpers.j2' as helpers with context %}
-{##}
-version: "3.9"
 
 networks:
   {{ helpers.default_network(198) | indent(2) }}

roles/alpina/collections/services/authentik/templates/docker-compose.yml.j2

@@ -1,6 +1,4 @@
 {% import 'contrib/compose_helpers.j2' as helpers with context %}
-{##}
-version: "3.9"
 
 networks:
   {{ helpers.default_network(253) | indent(2) }}

roles/alpina/collections/services/minio/templates/docker-compose.yml.j2

@@ -1,6 +1,4 @@
 {% import 'contrib/compose_helpers.j2' as helpers with context %}
-{##}
-version: "3.9"
 
 networks:
   {{ helpers.default_network(252) | indent(2) }}

roles/alpina/collections/services/monitoring/templates/docker-compose.yml.j2

@@ -1,6 +1,4 @@
 {% import 'contrib/compose_helpers.j2' as helpers with context %}
-{##}
-version: "3.9"
 
 networks:
   {{ helpers.default_network(251) | indent(2) }}
@@ -68,6 +66,25 @@ services:
       - {{ base_volume_path }}/monitoring/prometheus_configs:/etc/prometheus/extra:ro
       - {{ base_volume_path }}/monitoring/prometheus:/prometheus
 
+  node-exporter:
+    image: prom/node-exporter:latest
+    container_name: node-exporter
+    restart: unless-stopped
+    network_mode: host
+    pid: host
+    volumes:
+      - /:/host:ro,rslave
+
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:latest
+    container_name: cadvisor
+    restart: unless-stopped
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:rw
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+
   influxdb:
     image: influxdb:2.7-alpine
     container_name: influxdb

roles/alpina/collections/services/monitoring/templates/prometheus_config/prometheus.yml.j2

@@ -16,7 +16,7 @@ scrape_configs:
 
   - job_name: "cadvisor"
     static_configs:
-      - targets: ["{{ ansible_host }}:9110"]
+      - targets: ["cadvisor:8080"]
 
   - job_name: "traefik"
     static_configs:

roles/alpina/collections/services/traefik/templates/docker-compose.yml.j2

@@ -1,6 +1,4 @@
 {% import 'contrib/compose_helpers.j2' as helpers with context %}
-{##}
-version: "3.9"
 
 networks:
   traefik:
@@ -8,7 +6,8 @@ networks:
     enable_ipv6: true
     ipam:
       config:
-        - subnet: {{ traefik_ip }}/24
+        # TODO: Consider removing traefik network, it shouldn't be needed with host networking
+        - subnet: {{ traefik_subnet }}/24
         - subnet: {{ docker_ipv6_subnet | ansible.utils.ipsubnet(80, 255) }}
 
 services:

roles/alpina/tasks/deploy_compose_stack.yml

@@ -29,7 +29,7 @@
   when: item.state == "file"
 
 - name: Deploy docker-compose for {{ current_stack_name }}
-  command: docker compose -f "{{ current_stack_dest }}/docker-compose.yml" up -d --pull --remove-orphans
+  command: docker compose -f "{{ current_stack_dest }}/docker-compose.yml" up -d --pull always --remove-orphans
   register: docker_compose_output
   # Not perfect idempotency, but the built-in docker_compose module doesn't support docker-compose v2
   # And of course there's an IPv6 bug in docker-compose v1, smh