From fe65b634005ba61ebb06a32a5720eb5bae449abf Mon Sep 17 00:00:00 2001
From: Gabriel Luiz Freitas Almeida <gabriel@logspace.ai>
Date: Mon, 21 Aug 2023 08:19:12 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20chore(deploy):=20update=20docker?=
 =?UTF-8?q?-compose=20version=20to=203.8=20for=20better=20compatibility=20?=
 =?UTF-8?q?and=20features=20=F0=9F=90=B3=20chore(deploy):=20update=20traef?=
 =?UTF-8?q?ik=20image=20version=20to=20v3.0=20for=20improved=20functionali?=
 =?UTF-8?q?ty=20and=20compatibility=20=F0=9F=94=A7=20chore(deploy):=20remo?=
 =?UTF-8?q?ve=20unnecessary=20port=20mappings=20for=20backend,=20queue,=20?=
 =?UTF-8?q?pgadmin,=20redis,=20prometheus,=20and=20grafana=20services?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/docker-compose.override.yml |  2 +-
 deploy/docker-compose.yml          | 34 +++++++++++++++++-------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/deploy/docker-compose.override.yml b/deploy/docker-compose.override.yml
index eda492a24..d6984c959 100644
--- a/deploy/docker-compose.override.yml
+++ b/deploy/docker-compose.override.yml
@@ -1,4 +1,4 @@
-version: "3.3"
+version: "3.8"
 services:
   proxy:
     ports:
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index e35424c03..78623ffa1 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -1,8 +1,8 @@
-version: "3.3"
+version: "3.8"
 
 services:
   proxy:
-    image: traefik:v2.2
+    image: traefik:v3.0
     networks:
       - ${TRAEFIK_PUBLIC_NETWORK?Variable not set}
       - default
@@ -73,12 +73,14 @@ services:
       dockerfile: base.Dockerfile
     # user: your-non-root-user # Make sure your Dockerfile creates this user
     depends_on:
-      - queue
-      - db
+      db:
+        condition: service_healthy
+      queue:
+        condition: service_healthy
     env_file:
       - backend.env
-    ports:
-      - "7860"
+    # ports:
+    #   - 7860
     volumes:
       - ../:/app
       - ./startup-backend.sh:/startup-backend.sh # Ensure the paths match
@@ -104,6 +106,8 @@ services:
       placement:
         constraints:
           - node.labels.${STACK_NAME?Variable not set}.app-db-data == true
+    healthcheck:
+      test: "exit 0"
 
   pgadmin:
     image: dpage/pgadmin4
@@ -113,7 +117,8 @@ services:
     env_file:
       - ./pgadmin.env
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     volumes:
       - ./pgadmin:/var/lib/pgadmin
     deploy:
@@ -132,8 +137,8 @@ services:
 
   queue:
     image: redis:6.2.5
-    ports:
-      - "6379:6379"
+    # ports:
+    #   - 6379:6379
     healthcheck:
       test: "exit 0"
 
@@ -166,8 +171,7 @@ services:
       - ./flower.env
     environment:
       - CELERY_BROKER_URL='redis://$${LANGFLOW_REDIS_PASSWORD:+default:$${LANGFLOW_REDIS_PASSWORD}@}$${LANGFLOW_REDIS_HOST}:$${LANGFLOW_REDIS_PORT}/$${LANGFLOW_REDIS_DB}'
-    ports:
-      - "5555:5555"
+      - FLOWER_PORT=5555
     deploy:
       labels:
         - traefik.enable=true
@@ -208,8 +212,8 @@ services:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
     command:
       - "--config.file=/etc/prometheus/prometheus.yml"
-    ports:
-      - "9090:9090"
+    # ports:
+    #   - 9090:9090
     healthcheck:
       test: "exit 0"
     deploy:
@@ -224,8 +228,8 @@ services:
     depends_on:
       prometheus:
         condition: service_healthy
-    ports:
-      - "3000:3000"
+    # ports:
+    #   - 3000:3000
     volumes:
       - grafana_data:/var/lib/grafana
     deploy: