diff --git a/docker-compose.yml b/docker-compose.yml index 853bf23b5..65745b6a4 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: php: container_name: "dootask-php-${APP_ID}" - image: "kuaifan/php:swoole-8.0.rc13" + image: "kuaifan/php:swoole-8.0.rc14" shm_size: "2gb" ulimits: core: @@ -12,7 +12,6 @@ services: volumes: - ./docker/crontab/crontab.conf:/etc/supervisor/conf.d/crontab.conf - ./docker/php/php.conf:/etc/supervisor/conf.d/php.conf - - ./docker/ai/ai.conf:/etc/supervisor/conf.d/ai.conf - ./docker/php/php.ini:/usr/local/etc/php/php.ini - ./docker/log/supervisor:/var/log/supervisor - ./:/var/www @@ -50,6 +49,7 @@ services: - drawio-webapp - drawio-export - minder + - ai restart: unless-stopped redis: @@ -153,7 +153,6 @@ services: container_name: "dootask-approve-${APP_ID}" image: "hitosea2020/go-approve:0.1.3" environment: - TZ: "Asia/Shanghai" MYSQL_HOST: "${DB_HOST}" MYSQL_PORT: "${DB_PORT}" MYSQL_DBNAME: "${DB_DATABASE}" @@ -167,6 +166,14 @@ services: - mariadb restart: unless-stopped + ai: + container_name: "dootask-ai-${APP_ID}" + image: "kuaifan/dooai:0.0.1" + networks: + extnetwork: + ipv4_address: "${APP_IPPR}.12" + restart: unless-stopped + networks: extnetwork: name: "dootask-networks-${APP_ID}" diff --git a/docker/ai/.gitignore b/docker/ai/.gitignore deleted file mode 100644 index 16d3c4dbb..000000000 --- a/docker/ai/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.cache diff --git a/docker/ai/ai.conf b/docker/ai/ai.conf deleted file mode 100644 index 0505112ea..000000000 --- a/docker/ai/ai.conf +++ /dev/null @@ -1,10 +0,0 @@ -[program:ai] -directory=/var/www/docker/ai -command=/usr/lib/doo/doo_cli ai -numprocs=1 -autostart=true -autorestart=true -startretries=100 -user=root -redirect_stderr=true -stdout_logfile=/var/log/supervisor/%(program_name)s.log diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 7417aa589..b54dedbd7 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -190,7 +190,7 @@ server { proxy_set_header Scheme $scheme; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; - proxy_pass http://php:8881/; + proxy_pass http://ai:8881/; } }