From 7900f4d840c0080406e1db242482907d40e957a0 Mon Sep 17 00:00:00 2001
From: Fluder-Paradyne <121793617+Fluder-Paradyne@users.noreply.github.com>
Date: Wed, 2 Aug 2023 15:11:00 +0530
Subject: [PATCH] new docker compose dev (#938)

---
 docker-compose-dev.yaml           | 76 +++++++++++++++++++++++++++++++
 docker-compose.image.example.yaml |  6 +--
 docker-compose.yaml               | 28 ++++++------
 3 files changed, 94 insertions(+), 16 deletions(-)
 create mode 100644 docker-compose-dev.yaml

diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
new file mode 100644
index 000000000..94044916b
--- /dev/null
+++ b/docker-compose-dev.yaml
@@ -0,0 +1,76 @@
+version: '3.8'
+services:
+  backend:
+    volumes:
+      - "./:/app"
+    build: .
+    depends_on:
+      - super__redis
+      - super__postgres
+    networks:
+      - super_network
+    command: ["/app/wait-for-it.sh", "super__postgres:5432","-t","60","--","/app/entrypoint.sh"]
+  celery:
+    volumes:
+      - "./:/app"
+      - "${EXTERNAL_RESOURCE_DIR:-./workspace}:/app/ext"
+    build: .
+    depends_on:
+      - super__redis
+      - super__postgres
+    networks:
+      - super_network
+    command: ["/app/entrypoint_celery.sh"]
+  gui:
+    build:
+      context: ./gui
+      args:
+        NEXT_PUBLIC_API_BASE_URL: "/api"
+    networks:
+      - super_network
+#    volumes:
+#      - ./gui:/app
+#      - /app/node_modules/
+#      - /app/.next/
+  super__redis:
+    image: "redis/redis-stack-server:latest"
+    networks:
+      - super_network
+#    uncomment to expose redis port to host
+#    ports:
+#      - "6379:6379"
+    volumes:
+      - redis_data:/data
+
+  super__postgres:
+    image: "docker.io/library/postgres:latest"
+    environment:
+      - POSTGRES_USER=superagi
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=super_agi_main
+    volumes:
+      - superagi_postgres_data:/var/lib/postgresql/data/
+    networks:
+      - super_network
+#    uncomment to expose postgres port to host
+#    ports:
+#      - "5432:5432"
+
+  proxy:
+    image: nginx:stable-alpine
+    ports:
+      - "3000:80"
+    networks:
+      - super_network
+    depends_on:
+      - backend
+      - gui
+    volumes:
+      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
+
+networks:
+  super_network:
+    driver: bridge
+volumes:
+  superagi_postgres_data:
+  redis_data:
\ No newline at end of file
diff --git a/docker-compose.image.example.yaml b/docker-compose.image.example.yaml
index c5c393d7e..1e72aaf7c 100644
--- a/docker-compose.image.example.yaml
+++ b/docker-compose.image.example.yaml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   backend:
-    image: "superagidev/backend:dev"
+    image: "superagidev/superagi:main"
     depends_on:
       - super__redis
       - super__postgres
@@ -12,7 +12,7 @@ services:
     command: ["/app/wait-for-it.sh", "super__postgres:5432","-t","60","--","/app/entrypoint.sh"]
 
   celery:
-    image: "superagidev/backend:dev"
+    image: "superagidev/superagi:main"
     depends_on:
       - super__redis
       - super__postgres
@@ -25,7 +25,7 @@ services:
       - "./workspace:/app/workspace"
 
   gui:
-    image: "superagidev/gui:dev"
+    image: "superagidev/superagi-frontend:main"
     environment:
       - NEXT_PUBLIC_API_BASE_URL=/api
     networks:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 35a089433..ed07a89ff 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,37 +1,39 @@
 version: '3.8'
 services:
   backend:
+    image: "superagidev/superagi:main"
     volumes:
-      - "./:/app"
-    build: .
+      - "./workspace:/app/workspace"
     depends_on:
       - super__redis
       - super__postgres
     networks:
       - super_network
+    env_file:
+      - config.yaml
     command: ["/app/wait-for-it.sh", "super__postgres:5432","-t","60","--","/app/entrypoint.sh"]
+
   celery:
+    image: "superagidev/superagi:main"
     volumes:
-      - "./:/app"
+      - "./workspace:/app/workspace"
       - "${EXTERNAL_RESOURCE_DIR:-./workspace}:/app/ext"
-    build: .
     depends_on:
       - super__redis
       - super__postgres
     networks:
       - super_network
+    env_file:
+      - config.yaml
     command: ["/app/entrypoint_celery.sh"]
+
   gui:
-    build:
-      context: ./gui
-      args:
-        NEXT_PUBLIC_API_BASE_URL: "/api"
+    image: "superagidev/superagi-frontend:main"
+    environment:
+      - NEXT_PUBLIC_API_BASE_URL=/api
     networks:
       - super_network
-#    volumes:
-#      - ./gui:/app
-#      - /app/node_modules/
-#      - /app/.next/
+
   super__redis:
     image: "redis/redis-stack-server:latest"
     networks:
@@ -55,7 +57,7 @@ services:
 #    uncomment to expose postgres port to host
 #    ports:
 #      - "5432:5432"
-  
+
   proxy:
     image: nginx:stable-alpine
     ports: