From bb4556f023e54b11998c61de857e3d81d9138d56 Mon Sep 17 00:00:00 2001
From: Christian Kauer <c.kauer@krah-gruppe.de>
Date: Fri, 7 Feb 2025 13:52:33 +0100
Subject: [PATCH] fixes after update, disapble AI container

---
 docker-compose.yml | 63 ++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 826aeb6b..6d3ef41e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,19 +13,16 @@ services:
       - ./nginx/ssl/private_key.key:/etc/nginx/ssl/private_key.key
 
   # You do not need this if you have configured to use your own s3 file storage
-  # minio:
-    # restart: on-failure
-    # image: minio/minio
-    # ports:
-      # - 9000:9000
-    # environment:
-      # - MINIO_BROWSER_REDIRECT_URL=${FQDN?:err}/minio
-      # - MINIO_ROOT_USER=${APPFLOWY_S3_ACCESS_KEY:-minioadmin}
-      # - MINIO_ROOT_PASSWORD=${APPFLOWY_S3_SECRET_KEY:-minioadmin}
-    # command: server /data --console-address ":9001"
-    # volumes:
-      # - minio_data:/data
-
+#  minio:
+#    restart: on-failure
+#    image: minio/minio
+#    environment:
+#      - MINIO_BROWSER_REDIRECT_URL=${FQDN?:err}/minio
+#      - MINIO_ROOT_USER=${APPFLOWY_S3_ACCESS_KEY:-minioadmin}
+#      - MINIO_ROOT_PASSWORD=${APPFLOWY_S3_SECRET_KEY:-minioadmin}
+#    command: server /data --console-address ":9001"
+#    volumes:
+#      - minio_data:/data
 
   postgres:
     restart: on-failure
@@ -40,7 +37,7 @@ services:
       test: [ "CMD", "pg_isready", "-U", "${POSTGRES_USER}" ]
       interval: 5s
       timeout: 5s
-      retries: 6
+      retries: 12
     volumes:
       - ./migrations/before:/docker-entrypoint-initdb.d
       - postgres_data:/var/lib/postgresql/data
@@ -58,10 +55,10 @@ services:
       postgres:
         condition: service_healthy
     healthcheck:
-      test: [ "CMD", "nc", "-z", "localhost", "9999" ]
+      test: "curl --fail http://127.0.0.1:9999/health || exit 1"
       interval: 5s
       timeout: 5s
-      retries: 6
+      retries: 12
     image: appflowyinc/gotrue:${GOTRUE_VERSION:-latest}
     environment:
       # There are a lot of options to configure GoTrue. You can reference the example config:
@@ -148,6 +145,9 @@ services:
       args:
         FEATURES: ""
     image: appflowyinc/appflowy_cloud:${APPFLOWY_CLOUD_VERSION:-latest}
+    depends_on:
+      gotrue:
+        condition: service_healthy
 
   admin_frontend:
     restart: on-failure
@@ -160,16 +160,22 @@ services:
       - ADMIN_FRONTEND_REDIS_URL=${ADMIN_FRONTEND_REDIS_URL:-redis://redis:6379}
       - ADMIN_FRONTEND_GOTRUE_URL=${ADMIN_FRONTEND_GOTRUE_URL:-http://gotrue:9999}
       - ADMIN_FRONTEND_APPFLOWY_CLOUD_URL=${ADMIN_FRONTEND_APPFLOWY_CLOUD_URL:-http://appflowy_cloud:8000}
-		ADMIN_FRONTEND_PATH_PREFIX=${ADMIN_FRONTEND_PATH_PREFIX:-}
+      - ADMIN_FRONTEND_PATH_PREFIX=${ADMIN_FRONTEND_PATH_PREFIX:-}
+    depends_on:
+      appflowy_cloud:
+        condition: service_started
 
-  ai:
-    restart: on-failure
-    image: appflowyinc/appflowy_ai:${APPFLOWY_AI_VERSION:-latest}
-    environment:
-      - OPENAI_API_KEY=${AI_OPENAI_API_KEY}
-      - APPFLOWY_AI_SERVER_PORT=${AI_SERVER_PORT}
-      - APPFLOWY_AI_DATABASE_URL=${AI_DATABASE_URL}
-      - APPFLOWY_AI_REDIS_URL=${AI_REDIS_URL}
+#  ai:
+#    restart: on-failure
+#    image: appflowyinc/appflowy_ai:${APPFLOWY_AI_VERSION:-latest}
+#    environment:
+#      - OPENAI_API_KEY=${AI_OPENAI_API_KEY}
+#      - APPFLOWY_AI_SERVER_PORT=${AI_SERVER_PORT}
+#      - APPFLOWY_AI_DATABASE_URL=${AI_DATABASE_URL}
+#      - APPFLOWY_AI_REDIS_URL=${AI_REDIS_URL}
+#    depends_on:
+#      postgres:
+#        condition: service_healthy
 
   appflowy_worker:
     restart: on-failure
@@ -195,7 +201,10 @@ services:
       - APPFLOWY_MAILER_SMTP_USERNAME=${APPFLOWY_MAILER_SMTP_USERNAME}
       - APPFLOWY_MAILER_SMTP_EMAIL=${APPFLOWY_MAILER_SMTP_EMAIL}
       - APPFLOWY_MAILER_SMTP_PASSWORD=${APPFLOWY_MAILER_SMTP_PASSWORD}
-
+      - APPFLOWY_MAILER_SMTP_TLS_KIND=${APPFLOWY_MAILER_SMTP_TLS_KIND}
+    depends_on:
+      postgres:
+        condition: service_healthy
 
   appflowy_web:
     restart: on-failure
@@ -207,4 +216,4 @@ services:
       - AF_GOTRUE_URL=${API_EXTERNAL_URL}
 volumes:
   postgres_data:
-  # minio_data:
+#  minio_data: