diff --git a/.env b/.env index f6904df..e75acb4 100644 --- a/.env +++ b/.env @@ -15,6 +15,15 @@ NUXT_PUBLIC_BASE_SOCKETURL=ws://127.0.0.1:3002 ############################################## #comfyAI-web 前端应用暴露端口,访问地址ip:3010访问,初始化管理员账号admin,密码123456 WEB_PORT=3010 +#支持静态资源CDN,将静态资源从服务器分离 +NUXT_APP_CDN_URL= + +#视频编辑对外暴露端口 +VIDEO_EDIT_PORT=8000 + + + + #REDIS暴露端口,默认不暴露 REDIS_PORT= @@ -64,7 +73,6 @@ CONFIG_JWT_SECRET='this is a very secret secret' CONFIG_TOKEN_SIGN_SK=easyai2025easyai - #minio #MINIO_ROOT_USER=minioadmin #MINIO_ROOT_PASSWORD=minioadmin diff --git a/docker-compose.yml b/docker-compose.yml index ad87581..add9316 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,6 +28,7 @@ services: - NUXT_PUBLIC_BASE_SSRURL=http://172.21.0.6:3001 # 默认的服务器websocket地址,本地不需要更改,云服务需要修改为云端IP,并放行对应端口 - NUXT_PUBLIC_BASE_SOCKETURL=${NUXT_PUBLIC_BASE_SOCKETURL} + - NUXT_APP_CDN_URL=${NUXT_APP_CDN_URL} # 日志大小设置,避免日志文件过大 env_file: - .env @@ -97,6 +98,8 @@ services: - CONFIG_MQ_HOST=rabbitmq - CONFIG_MQ_PORT=${CONFIG_MQ_PORT} - CONFIG_MQ_VHOST=${CONFIG_MQ_VHOST} + # 视频编辑接口 + - CONFIG_VIDEO_EDIT_API_URL=http://video-edit:8000 # 日志大小设置,避免日志文件过大 env_file: - .env @@ -230,6 +233,29 @@ services: options: max-size: "100m" max-file: "10" + video-edit: + image: registry.cn-shanghai.aliyuncs.com/easyaigc/videoedit:latest + container_name: video-edit + labels: + - "com.centurylinklabs.watchtower.enable=true" + volumes: + - ./data/videoedit/temp:/app/temp + ports: + - "${VIDEO_EDIT_PORT}:8000" + environment: + - PYTHONUNBUFFERED=1 + - OMP_NUM_THREADS=4 + - OPENBLAS_NUM_THREADS=4 + shm_size: 2g + restart: unless-stopped + networks: + - comfyai + healthcheck: + test: [ "CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/docs')" ] + interval: 30s + timeout: 10s + retries: 3 + start_period: 40s # portainer: # image: registry.cn-shanghai.aliyuncs.com/comfy-ai/portainer-ce:2.21.5 # container_name: portainer