- Improvements working with the cloud, minio, graylog and some first bugfixing

docker/compose_dev.yaml

@@ -29,9 +29,16 @@ x-common-variables: &common-variables
   MINIO_ENDPOINT: minio:9000
   MINIO_ACCESS_KEY: minioadmin
   MINIO_SECRET_KEY: minioadmin
+  NGINX_SERVER_NAME: 'localhost http://macstudio.ask-eve-ai-local.com/'
+
+
+networks:
+  eveai-network:
+    driver: bridge
 
 services:
   nginx:
+    image: josakola/nginx:latest
     build:
       context: ..
       dockerfile: ./docker/nginx/Dockerfile
@@ -41,6 +48,8 @@ services:
     ports:
       - 80:80
       - 8080:8080
+    environment:
+      <<: *common-variables
     volumes:
       - ../nginx:/etc/nginx
       - ../nginx/sites-enabled:/etc/nginx/sites-enabled
@@ -50,8 +59,11 @@ services:
     depends_on:
       - eveai_app
       - eveai_chat
+    networks:
+      - eveai-network
 
   eveai_app:
+    image: josakola/eveai_app:latest
     build:
       context: ..
       dockerfile: ./docker/eveai_app/Dockerfile
@@ -62,6 +74,7 @@ services:
       - 5001:5001
     environment:
       <<: *common-variables
+      COMPONENT_NAME: eveai_app
     volumes:
       - ../eveai_app:/app/eveai_app
       - ../common:/app/common
@@ -69,7 +82,7 @@ services:
       - ../migrations:/app/migrations
       - ../scripts:/app/scripts
       - ../patched_packages:/app/patched_packages
-      - ./logs:/app/logs
+      - eveai_logs:/app/logs
     depends_on:
        db:
          condition: service_healthy
@@ -82,9 +95,13 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-    command: ["sh", "-c", "scripts/start_eveai_app.sh"]
+#    entrypoint: ["scripts/entrypoint.sh"]
+#    command: ["scripts/start_eveai_app.sh"]
+    networks:
+      - eveai-network
 
   eveai_workers:
+    image: josakola/eveai_workers:latest
     build:
       context: ..
       dockerfile: ./docker/eveai_workers/Dockerfile
@@ -95,13 +112,14 @@ services:
 #      - 5001:5001
     environment:
       <<: *common-variables
+      COMPONENT_NAME: eveai_workers
     volumes:
       - ../eveai_workers:/app/eveai_workers
       - ../common:/app/common
       - ../config:/app/config
       - ../scripts:/app/scripts
       - ../patched_packages:/app/patched_packages
-      - ./logs:/app/logs
+      - eveai_logs:/app/logs
     depends_on:
       db:
         condition: service_healthy
@@ -114,9 +132,13 @@ services:
 #      interval: 10s
 #      timeout: 5s
 #      retries: 5
-    command: [ "sh", "-c", "scripts/start_eveai_workers.sh" ]
+#    entrypoint: [ "sh", "-c", "scripts/entrypoint.sh" ]
+#    command: [ "sh", "-c", "scripts/start_eveai_workers.sh" ]
+    networks:
+      - eveai-network
 
   eveai_chat:
+    image: josakola/eveai_chat:latest
     build:
       context: ..
       dockerfile: ./docker/eveai_chat/Dockerfile
@@ -127,13 +149,14 @@ services:
       - 5002:5002
     environment:
       <<: *common-variables
+      COMPONENT_NAME: eveai_chat
     volumes:
       - ../eveai_chat:/app/eveai_chat
       - ../common:/app/common
       - ../config:/app/config
       - ../scripts:/app/scripts
       - ../patched_packages:/app/patched_packages
-      - ./logs:/app/logs
+      - eveai_logs:/app/logs
     depends_on:
       db:
         condition: service_healthy
@@ -144,9 +167,13 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-    command: ["sh", "-c", "scripts/start_eveai_chat.sh"]
+#    entrypoint: [ "sh", "-c", "scripts/entrypoint.sh" ]
+#    command: ["sh", "-c", "scripts/start_eveai_chat.sh"]
+    networks:
+      - eveai-network
 
   eveai_chat_workers:
+    image: josakola/eveai_chat_workers:latest
     build:
       context: ..
       dockerfile: ./docker/eveai_chat_workers/Dockerfile
@@ -157,13 +184,14 @@ services:
 #      - 5001:5001
     environment:
       <<: *common-variables
+      COMPONENT_NAME: eveai_chat_workers
     volumes:
       - ../eveai_chat_workers:/app/eveai_chat_workers
       - ../common:/app/common
       - ../config:/app/config
       - ../scripts:/app/scripts
       - ../patched_packages:/app/patched_packages
-      - ./logs:/app/logs
+      - eveai_logs:/app/logs
     depends_on:
       db:
         condition: service_healthy
@@ -174,7 +202,10 @@ services:
 #      interval: 10s
 #      timeout: 5s
 #      retries: 5
-    command: [ "sh", "-c", "scripts/start_eveai_chat_workers.sh" ]
+#    entrypoint: [ "sh", "-c", "scripts/entrypoint.sh" ]
+#    command: [ "sh", "-c", "scripts/start_eveai_chat_workers.sh" ]
+    networks:
+      - eveai-network
 
   db:
     hostname: db
@@ -194,6 +225,8 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+    networks:
+      - eveai-network
 
   redis:
     image: redis:7.2.5
@@ -207,6 +240,8 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+    networks:
+      - eveai-network
 
   minio:
     image: minio/minio
@@ -228,9 +263,12 @@ services:
       timeout: 20s
       retries: 3
       start_period: 30s
+    networks:
+      - eveai-network
 
 volumes:
   minio_data:
+  eveai_logs:
 #  db-data:
 #  redis-data:
 #  tenant-files: