From 428db42140f3aee80cb89e7acc9e8f68a1f59692 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 15 May 2025 23:25:34 +0800 Subject: [PATCH] no message --- app/Module/Apps.php | 6 ------ docker-compose.yml | 11 ----------- docker/nginx/default.conf | 19 ++++++++++++++++++- docker/nginx/location/ai.conf | 12 ------------ docker/nginx/location/appstore.conf | 17 ----------------- 5 files changed, 18 insertions(+), 47 deletions(-) delete mode 100644 docker/nginx/location/ai.conf delete mode 100755 docker/nginx/location/appstore.conf diff --git a/app/Module/Apps.php b/app/Module/Apps.php index ad25165c5..395093f60 100644 --- a/app/Module/Apps.php +++ b/app/Module/Apps.php @@ -14,12 +14,6 @@ class Apps 'nginx', 'redis', 'mariadb', - 'drawio-webapp', - 'drawio-expont', - 'minder', - 'approve', - 'ai', - 'face', 'search', 'appstore', ]; diff --git a/docker-compose.yml b/docker-compose.yml index 6290e6504..44f26094e 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,17 +80,6 @@ services: - extnetwork restart: unless-stopped - ai: - container_name: "dootask-ai-${APP_ID}" - image: "kuaifan/dootask-ai:0.3.5" - environment: - REDIS_HOST: "${REDIS_HOST}" - REDIS_PORT: "${REDIS_PORT}" - TIMEOUT: 600 - networks: - - extnetwork - restart: unless-stopped - search: container_name: "dootask-search-${APP_ID}" image: "public.ecr.aws/zinclabs/zincsearch:0.4.10" diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 499fb9f26..2a556c89a 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -78,7 +78,24 @@ server { proxy_pass http://service; } - include /var/www/docker/nginx/location/*.conf; + location /appstore/ { + proxy_http_version 1.1; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Real-PORT $remote_port; + proxy_set_header X-Forwarded-Host $the_host/appstore; + proxy_set_header X-Forwarded-Proto $the_scheme; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header Scheme $scheme; + proxy_set_header Server-Protocol $server_protocol; + proxy_set_header Server-Name $server_name; + proxy_set_header Server-Addr $server_addr; + proxy_set_header Server-Port $server_port; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + proxy_pass http://appstore/; + } + include /var/www/docker/appstore/configs/*/nginx.conf; } diff --git a/docker/nginx/location/ai.conf b/docker/nginx/location/ai.conf deleted file mode 100644 index 771227d56..000000000 --- a/docker/nginx/location/ai.conf +++ /dev/null @@ -1,12 +0,0 @@ -location /ai/ { - proxy_http_version 1.1; - proxy_buffering off; - proxy_cache off; - proxy_read_timeout 3600s; - proxy_send_timeout 3600s; - proxy_connect_timeout 3600s; - proxy_set_header Scheme $scheme; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_pass http://ai:5001/; -} diff --git a/docker/nginx/location/appstore.conf b/docker/nginx/location/appstore.conf deleted file mode 100755 index c2b66aa8e..000000000 --- a/docker/nginx/location/appstore.conf +++ /dev/null @@ -1,17 +0,0 @@ -location /appstore/ { - proxy_http_version 1.1; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Real-PORT $remote_port; - proxy_set_header X-Forwarded-Host $the_host/appstore; - proxy_set_header X-Forwarded-Proto $the_scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header Scheme $scheme; - proxy_set_header Server-Protocol $server_protocol; - proxy_set_header Server-Name $server_name; - proxy_set_header Server-Addr $server_addr; - proxy_set_header Server-Port $server_port; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_pass http://appstore/; -}