for homecuda

docker/compose/homecuda/acc/docker-compose.yml

@@ -4,7 +4,7 @@ services:
   nginxsrv:
     image: nginx:alpine
     ports:
-      - "80:80"
+      - 80:80
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
@@ -23,12 +23,11 @@ services:
   mobilesrv:
     image: php-zts:7.3.18
     ports:
-      - "9100:9100"
+      - 9100:9100
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-#      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - ../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
@@ -37,4 +36,22 @@ services:
     deploy:
       resources:
         limits:
+          cpus: '8'
+
+  vapisrv:
+    image: php-zts:7.3.18
+    ports:
+      - 9702:9100
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+      - ../conf/php/vapi-spwan-start:/usr/local/bin/docker-spwan-start
+    container_name: "panda-vapi"
+    command: ['docker-spwan-start']
+    deploy:
+      resources:
+        limits:
           cpus: '8'

docker/compose/homecuda/admin/docker-compose.yml

@@ -22,7 +22,7 @@ services:
   websrv:
     image: php-fpm:alpine
     ports:
-      - "9000:9000"
+      - 9000:9000
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro

docker/compose/homecuda/cli/docker-compose.yml

@@ -20,7 +20,7 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php-swoole-debug.ini:/usr/local/etc/php/php.ini
+      - ../conf/php/php-swoole.ini:/usr/local/etc/php/php.ini
       - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - ../conf/php/vender-init:/usr/local/bin/vender-init
@@ -31,7 +31,7 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - /mnt/upload:/var/www/html/data/upload
 
       - /mnt/shoplog:/var/www/html/data/log

docker/compose/homecuda/conf/php/vapi-spwan-start

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+spawn-fcgi -a 0.0.0.0 -p 9100 -F 1 -f "php /var/www/html/vapi/vapi.php"
+
+time=$(date "+%Y%m%d")
+
+if [ ! -f "/var/www/html/data/log/${time}-vapi.log" ]; then
+    touch "/var/www/html/data/log/${time}-vapi.log"
+fi
+
+tail -f "/var/www/html/data/log/${time}-vapi.log"

docker/compose/homecuda/slave-crond/docker-compose.yml

@@ -47,4 +47,15 @@ services:
     deploy:
       resources:
         limits:
-          cpus: '8'
+          cpus: '8'
+
+  statutil:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+    container_name: "panda-statutil"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','stat_util']

docker/compose/homecuda/statcalc/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+
+services:
+  mamount:
+    image: pycpu:3.7.10
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+      - /mnt/stdata:/var/www/html/data/stdata
+    container_name: "panda-mamount"
+    command: [ 'python','mamount.py', '-h', '192.168.3.46', '-p', '6379' ]

docker/compose/homecuda/statsec/docker-compose.yml

@@ -10,8 +10,7 @@ services:
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-qreader"
-#    command: [ 'mpiexec', '-n','4','python','qreader.py','-h', '192.168.3.104', '-p', '6379' ]
-    command: [ 'python','qreader.py','-h', '192.168.3.104', '-p', '6379' ]
+    command: ['python','qreader.py','-h', '192.168.3.46', '-p', '6379']
     deploy:
       resources:
         limits:

docker/compose/homecuda/worker/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-codispatcher"
-    command: [php,"/var/www/html/rdispatcher/codispatcher.php","32"]
+    command: [php,"/var/www/html/rdispatcher/codispatcher.php","1"]
     deploy:
       resources:
         limits:

docker/compose/workcuda/cli/docker-compose.yml

@@ -48,4 +48,6 @@ services:
       - /mnt/xyzshop:/var/www/html
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
-    container_name: "panda-python"
+    container_name: "panda-python"
+    extra_hosts:
+      - "docker.hostip:172.17.0.1"

docker/compose/workcuda/conf/php/php-swoole.ini

@@ -1942,13 +1942,3 @@ ldap.max_links = -1
 ; End:
 
 output_buffering = On
-
-[xdebug]
-xdebug.default_enable=1
-xdebug.remote_enable=1
-xdebug.remote_handler=dbgp
-xdebug.remote_host=192.168.3.220
-xdebug.remote_port=9300
-xdebug.remote_mode=req
-xdebug.remote_autostart=1
-xdebug.idekey=PHPSTORM

docker/compose/workcuda/storage/docker-compose.yml

@@ -10,4 +10,8 @@ services:
       - ../conf/redis/6379.conf:/etc/redis/redis.conf
       - /mnt/redisdata:/data
     container_name: "panda-redis"
-    command: [redis-server,"/etc/redis/redis.conf"]
+    command: [redis-server,"/etc/redis/redis.conf"]
+    deploy:
+      resources:
+        limits:
+          cpus: '8'