chore(compose): refactor django environment next to its manifest

compose.yml

@@ -4,39 +4,6 @@ networks:
     external: true
 
 x-django: &django
-  environment:
-    - DEBUG
-    - DEFAULT_FROM_EMAIL
-
-    - DJANGO_SETTINGS_MODULE
-    - DJANGO_SECRET_KEY
-
-    - EXTERNAL_REQUESTS_VERIFY_SSL
-
-    - "FORCE_HTTPS_URLS=${FORCE_HTTPS_URLS:-False}"
-    - FUNKWHALE_PROTOCOL
-    - "FUNKWHALE_HOSTNAME=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}"
-
-    - DATABASE_URL
-    - CACHE_URL
-    - EMAIL_CONFIG
-    - TYPESENSE_API_KEY
-
-    - "STATIC_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/static/"
-    - "MEDIA_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/media/"
-
-    - STATIC_ROOT
-    - MEDIA_ROOT
-
-    - FUNKWHALE_SPA_HTML_ROOT
-    - LDAP_ENABLED
-    - BROWSABLE_API_ENABLED
-    - "MUSIC_DIRECTORY_PATH=${MUSIC_DIRECTORY_PATH:-/music}"
-
-    - C_FORCE_ROOT
-    - PYTHONDONTWRITEBYTECODE
-    - PYTHONTRACEMALLOC
-
   dns: 172.17.0.1
   dns_search: funkwhale.test
 

compose/app.django.yml

@@ -1,5 +1,7 @@
 x-django: &django
   image: funkwhale-api
+  networks:
+    - internal
   volumes:
     - ../api:/app
     - ../.env:/app/.env
@@ -13,8 +15,38 @@ x-django: &django
       condition: service_healthy
     redis:
       condition: service_healthy
-  networks:
+  environment:
-    - internal
+    - DEBUG
+    - DEFAULT_FROM_EMAIL
+
+    - DJANGO_SETTINGS_MODULE
+    - DJANGO_SECRET_KEY
+
+    - EXTERNAL_REQUESTS_VERIFY_SSL
+
+    - "FORCE_HTTPS_URLS=${FORCE_HTTPS_URLS:-False}"
+    - FUNKWHALE_PROTOCOL
+    - "FUNKWHALE_HOSTNAME=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}"
+
+    - DATABASE_URL
+    - CACHE_URL
+    - EMAIL_CONFIG
+    - TYPESENSE_API_KEY
+
+    - "STATIC_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/static/"
+    - "MEDIA_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/media/"
+
+    - STATIC_ROOT
+    - MEDIA_ROOT
+
+    - FUNKWHALE_SPA_HTML_ROOT
+    - LDAP_ENABLED
+    - BROWSABLE_API_ENABLED
+    - "MUSIC_DIRECTORY_PATH=${MUSIC_DIRECTORY_PATH:-/music}"
+
+    - C_FORCE_ROOT
+    - PYTHONDONTWRITEBYTECODE
+    - PYTHONTRACEMALLOC
 
 services:
   api: