Clean up compose files one last time

compose.override.local.yml

@@ -16,6 +16,8 @@ services:
     env_file:
       - ./.envs/.local/.django
       - ./.envs/.local/.postgres
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://django:8000/process_expired/"]
     ports:
       - "8000"
 
@@ -53,3 +55,10 @@ services:
     ports:
       - "179"
       - "50051"
+
+networks:
+  default:
+    ipam:
+      driver: default
+      config:
+        - subnet: 0200:c0:ff:ee::/48

compose.override.production.yml

@@ -16,6 +16,10 @@ services:
       - ./.envs/.production/.django
       - ./.envs/.production/.postgres
       - /etc/vault.d/secrets/kv_root_security.env
+    volumes:
+      - ./staticfiles:/staticfiles
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://django:5000/process_expired/"]
 
   postgres:
     volumes:
@@ -43,7 +47,6 @@ services:
       - "80:80"
 
   redis:
-    image: redis:5.0
     volumes:
       - production_redis_data:/var/lib/redis:Z
 
@@ -66,6 +69,10 @@ services:
 networks:
   default:
     enable_ipv6: true
+    ipam:
+      driver: default
+      config:
+        - subnet: 0200:c0:ff:ee::/48
   peering:
     enable_ipv6: true
     driver: macvlan

compose.yml

@@ -14,11 +14,8 @@ services:
       default: {}
     sysctls:
       - net.ipv6.conf.all.disable_ipv6=0
-    volumes:
-      - ./staticfiles:/staticfiles
     command: /start
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://django:8000/process_expired/"]
       interval: 30s
       timeout: 30s
       start_period: 30s
@@ -68,9 +65,3 @@ services:
     sysctls:
       - net.ipv6.conf.all.disable_ipv6=0
 
-networks:
-  default:
-    ipam:
-      driver: default
-      config:
-        - subnet: 0200:c0:ff:ee::/48