Merge branch 'main' of ssh://git.autonomic.zone:2222/coop-cloud/mastodon into main

compose.yml

@@ -49,7 +49,11 @@ services:
       - proxy
       - internal_network
     healthcheck:
-      test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:3000/health || exit 1"]
+      test:
+        [
+          "CMD-SHELL",
+          "wget -q --spider --proxy=off localhost:3000/health || exit 1",
+        ]
     deploy:
       restart_policy:
         condition: on-failure
@@ -69,10 +73,6 @@ services:
         # - "traefik.http.routers.${STACK_NAME}_hack.entrypoints=websecure"
         # - "traefik.http.routers.${STACK_NAME}_hack.middlewares=mastodon-webfinger@docker"
 
-    depends_on:
-      - db
-      - redis
-#      - es
     volumes: &appVolume
       - app:/mastodon
     # secrets: &secrets
@@ -86,7 +86,7 @@ services:
       - DB_PORT
       - REDIS_HOST
       - REDIS_PORT
-      - REDIS_URL=
+      - REDIS_URL
       - REDIS_NAMESPACE
       - CACHE_REDIS_HOST
       - CACHE_REDIS_PORT
@@ -170,7 +170,11 @@ services:
     command: node ./streaming
     networks: *bothNetworks
     healthcheck:
-      test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1"]
+      test:
+        [
+          "CMD-SHELL",
+          "wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1",
+        ]
     deploy:
       restart_policy:
         condition: on-failure
@@ -186,9 +190,6 @@ services:
         #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-    depends_on:
-      - db
-      - redis
     environment: *env
     volumes: *appVolume # used to make sure this volume is created
 
@@ -198,9 +199,6 @@ services:
     deploy:
       restart_policy:
         condition: on-failure
-    depends_on:
-      - db
-      - redis
     networks: *bothNetworks
     volumes: *appVolume
     environment: *env