From ff8c30c06af0397c38eef07eb6d3f84f9ff420d5 Mon Sep 17 00:00:00 2001
From: jon r <jon@allmende.io>
Date: Fri, 11 Apr 2025 12:11:23 +0200
Subject: [PATCH] fix(compose/typesense): document dependency of api on app
---
compose.yml | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/compose.yml b/compose.yml
index 072a507e0..06f0a7a73 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,12 +3,13 @@ networks:
web:
external: true
-x-django: &django
- depends_on:
- postgres:
- condition: service_healthy
- redis:
- condition: service_healthy
+x-django-depends-on: &django-depends-on
+ postgres:
+ condition: service_healthy
+ redis:
+ condition: service_healthy
+
+x-dns: &dns
dns: 172.17.0.1
dns_search: funkwhale.test
@@ -22,13 +23,19 @@ services:
extends:
file: ./compose/app.django.yml
service: api
- <<: *django
+ depends_on:
+ <<: *django-depends-on
+ app:
+ condition: service_healthy
+ <<: *dns
worker:
extends:
file: ./compose/app.django.yml
service: worker
- <<: *django
+ depends_on:
+ <<: *django-depends-on
+ <<: *dns
web:
extends: