更新部署文件

docker-compose.yml

@@ -49,7 +49,6 @@ services:
       - "com.centurylinklabs.watchtower.enable=true"
     ports:
       - "${SERVER_HTTP_PORT}:3001"    #http端口
-      - "${SERVER_WS_PORT}:3002"    #websocket端口
     read_only: true
     networks:
       comfyai:
@@ -57,12 +56,14 @@ services:
     depends_on:
       - mongo
       - redis
+      - rabbitmq
     volumes:
       - ./data/upload:/app/upload
       - ./data/backups:/app/backups
       - ./data/restores:/app/restores
       - ./data/tmp:/tmp
       - ./data/backend/.pm2:/app/.pm2
+#      - ./data/backend/pm2.config.js:/app/pm2.config.js
     restart: unless-stopped
     environment:
       #  MongoDB配置，用户管理，不会配置的话保持默认即可
@@ -82,6 +83,46 @@ services:
       - CONFIG_PROXY_URL=${CONFIG_PROXY_URL}
       #禁用文档 true/false/留空
       - CONFIG_DOCS_DISABLE=false
+      #MQ
+      - CONFIG_MQ_USER=${CONFIG_MQ_USER}
+      - CONFIG_MQ_PASSWORD=${CONFIG_MQ_PASSWORD}
+      - CONFIG_MQ_HOST=rabbitmq
+      - CONFIG_MQ_PORT=${CONFIG_MQ_PORT}
+    # 日志大小设置，避免日志文件过大
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "10"
+  ws-gateway:
+    container_name: easyai-wsgateway  # websocket网关
+    # 阿里云镜像地址
+    image: registry.cn-shanghai.aliyuncs.com/easyaigc/wsgateway:latest # 阿里云
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
+    ports:
+      - "${SERVER_WS_PORT}:3002"    #http端口
+    read_only: true
+    networks:
+      - comfyai
+    depends_on:
+      - redis
+      - rabbitmq
+    volumes:
+      - ./data/wsgateway/.pm2:/app/.pm2
+    restart: unless-stopped
+    environment:
+      #  Redis配置，队列缓存，不会配置的话保持默认即可
+      - CONFIG_COMFYUI_QUENE_REDIS_HOST=172.21.0.4
+      - CONFIG_COMFYUI_QUENE_REDIS_PORT=6379
+      - CONFIG_COMFYUI_QUENE_REDIS_PASSWORD=
+      #日志与调试
+      - LOG_LEVEL=${LOG_LEVEL}
+      #MQ
+      - CONFIG_MQ_USER=${CONFIG_MQ_USER}
+      - CONFIG_MQ_PASSWORD=${CONFIG_MQ_PASSWORD}
+      - CONFIG_MQ_HOST=rabbitmq
+      - CONFIG_MQ_PORT=${CONFIG_MQ_PORT}
     # 日志大小设置，避免日志文件过大
     logging:
       driver: "json-file"
@@ -113,6 +154,12 @@ services:
       retries: 3
       timeout: 10s
       start_period: 60s
+    # 日志大小设置，避免日志文件过大
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "10"
   redis:
     image: registry.cn-shanghai.aliyuncs.com/comfy-ai/redis-aliyun:latest
     container_name: redis
@@ -126,6 +173,28 @@ services:
     networks:
       comfyai:
         ipv4_address: 172.21.0.4
+    # 日志大小设置，避免日志文件过大
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "10"
+  rabbitmq:
+    image: registry.cn-shanghai.aliyuncs.com/easyaigc/mq:latest #阿里云镜像加速
+#    image: rabbitmq:4-management #官方原版镜像
+    container_name: rabbitmq
+    restart: unless-stopped
+    environment:
+      RABBITMQ_DEFAULT_USER: ${CONFIG_MQ_USER}        # 登录用户名
+      RABBITMQ_DEFAULT_PASS: ${CONFIG_MQ_PASSWORD}    # 登录密码
+    ports:
+      - "${CONFIG_MQ_PORT}:${CONFIG_MQ_PORT}"    # 应用连接端口 (AMQP)
+      - "${CONFIG_MQ_ADMIN_PORT}:15672"  # Web 管理界面
+    volumes:
+      - rabbitmq_data:/var/lib/rabbitmq  # 持久化数据
+    networks:
+      comfyai:
+        ipv4_address: 172.21.0.12
   watchtower:
     image: registry.cn-shanghai.aliyuncs.com/comfy-ai/watchtower-aliyun:latest
     volumes:
@@ -142,20 +211,32 @@ services:
     networks:
       comfyai:
         ipv4_address: 172.21.0.9
-  portainer:
-    image: registry.cn-shanghai.aliyuncs.com/comfy-ai/portainer-ce:2.21.5
-    container_name: portainer
-    restart: always
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - portainer_data:/data
-    networks:
-      comfyai:
-        ipv4_address: 172.21.0.11
-#    ports:
-#      - "${PORTAINER_PORT}:9000"
-#      - "${PORTAINER_HTTPS_PORT}:9443"
-    read_only: true
+    # 日志大小设置，避免日志文件过大
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "10"
+#  portainer:
+#    image: registry.cn-shanghai.aliyuncs.com/comfy-ai/portainer-ce:2.21.5
+#    container_name: portainer
+#    restart: always
+#    volumes:
+#      - /var/run/docker.sock:/var/run/docker.sock
+#      - portainer_data:/data
+#    networks:
+#      comfyai:
+#        ipv4_address: 172.21.0.11
+#    # 日志大小设置，避免日志文件过大
+#    logging:
+#      driver: "json-file"
+#      options:
+#        max-size: "100m"
+#        max-file: "10"
+##    ports:
+##      - "${PORTAINER_PORT}:9000"
+##      - "${PORTAINER_HTTPS_PORT}:9443"
+#    read_only: true
 # 如果需要部署minio，取消下方的注释即可
 #  minio:
 #    #    image: minio/minio
@@ -178,6 +259,7 @@ services:
 volumes:
   mongo_data:
   portainer_data:
+  rabbitmq_data:
 networks:
   comfyai:
     driver: bridge