dev

docker/compose/stanley/docker-compose.yml

@@ -1,16 +1,6 @@
 version: "3.7"
 
 services:
-#  gogs:
-#    image: gogs/gogs:latest
-#    ports:
-#      - "10080:3000"
-#      - "10022:22"
-#    volumes:
-#      - /mnt/gitcode:/data
-#      - /mnt/gogs:/app/gogs
-#    container_name: "ibaobei-gogs"
-
   nginxsrv:
     image: nginx:alpine
     ports:

docker/compose/xyz-arw/docker-compose.yml

@@ -18,18 +18,6 @@ services:
     command: [nginx,'-g','daemon off;']
     extra_hosts:
       - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
-
-  redisrv:
-    image: redis:alpine
-    ports:
-      - "6379:6379"
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../conf/redis/6379.conf:/etc/redis/redis.conf
-      - /mnt/redisdata:/data
-    container_name: "panda-redis"
-    command: [redis-server,"/etc/redis/redis.conf"]
 
   mobilesrv:
     image: php-zts:7.3.18
@@ -47,69 +35,22 @@ services:
     depends_on:
       - "redisrv"
 
-  raccsrv:
-    image: php-zts:7.3.18
-    ports:
-      - "9101:9101"
+  cordsrv:
+    image: php-swool-redis:latest
     volumes:
       - ../../conf/etc/localtime:/etc/localtime:ro
       - ../../../:/var/www/html
-      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/racc-spwan-start-lz:/usr/local/bin/docker-spwan-start
-    container_name: "panda-racc"
-    command: [docker-spwan-start]
-    depends_on:
-      - "redisrv"
+      - ../../conf/php/xyz-php-swoole.ini:/usr/local/etc/php/php.ini
+    container_name: "panda-codispatcher"
+    command: [php,"/var/www/html/rdispatcher/codispatcher.php","16"]
+    deploy:
+      resources:
+        limits:
+          cpus: '8'
 
-  mchsrv:
-    image: php-zts:7.3.18
-    ports:
-      - "9102:9102"
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../../:/var/www/html
-      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/mch-spwan-start-lz:/usr/local/bin/docker-spwan-start
-    container_name: "panda-merchant"
-    command: [docker-spwan-start]
-    depends_on:
-       - "redisrv"
-
-  websrv:
-    image: php-fpm:alpine
-    ports:
-      - "9000:9000"
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../../:/var/www/html
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-      - ../../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
-    container_name: "panda-web"
-    command: [php-fpm]
-    depends_on:
-      - "redisrv"
-
-  crontabsrv:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../../:/var/www/html
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-      - ../../conf/crontab/root:/var/spool/cron/crontabs/root
-    container_name: "panda-crontab"
-    command: [crond,"-f"]
-    depends_on:
-      - "redisrv"
-
-  cronsec:
+  queuesrv:
     image: php-zts-debug:7.3.18
     volumes:
       - ../../conf/etc/localtime:/etc/localtime:ro
@@ -117,21 +58,19 @@ services:
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-    container_name: "panda-cronsec"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
+    container_name: "panda-queue"
+    command: [php,"/var/www/html/queue/index.php", "queue", "index"]
 
-  wsdsrv:
+  searcher:
     image: php-zts-debug:7.3.18
-    ports:
-      - "60987:60987"
     volumes:
       - ../../conf/etc/localtime:/etc/localtime:ro
       - ../../../:/var/www/html
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-    container_name: "panda-wsd"
-    command: [php,"/var/www/html/wsd_bridge.php"]
+    container_name: "panda-searcher"
+    command: [php, "/var/www/html/searcher.php"]
 
   phpcli:
     image: php-zts-debug:7.3.18
@@ -141,6 +80,4 @@ services:
       - ../../../:/var/www/html
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-php"
-    depends_on:
-      - "redisrv"
+    container_name: "panda-php"

docker/compose/xyz-storage/docker-compose.yml

@@ -1,25 +1,6 @@
 version: "3.7"
 
 services:
-  nginxsrv:
-    image: nginx:alpine
-    ports:
-      - "443:443"
-      - "80:80"
-    volumes:
-      - ../../../:/var/www/html
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - /nfs/upload:/var/www/html/data/upload
-      - /nfs/merchant:/var/www/html/merchant
-      - /nfs/icp:/var/www/html/icp
-      - ../../conf/nginx/cert:/etc/nginx/cert
-      - ../../conf/nginx/nginx-xyz-https.conf:/etc/nginx/nginx.conf:ro
-    container_name: "panda-nginx"
-    command: [nginx,'-g','daemon off;']
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
-
   redisrv:
     image: redis:alpine
     ports:
@@ -31,70 +12,6 @@ services:
     container_name: "panda-redis"
     command: [redis-server,"/etc/redis/redis.conf"]
 
-  mobilesrv:
-    image: php-zts:7.3.18
-    ports:
-      - "9100:9100"
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../../:/var/www/html
-      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
-    container_name: "panda-mobile"
-    command: ['docker-spwan-start']
-    depends_on:
-      - "redisrv"
-
-  raccsrv:
-    image: php-zts:7.3.18
-    ports:
-      - "9101:9101"
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../../:/var/www/html
-      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/racc-spwan-start-lz:/usr/local/bin/docker-spwan-start
-    container_name: "panda-racc"
-    command: [docker-spwan-start]
-    depends_on:
-      - "redisrv"
-
-  mchsrv:
-    image: php-zts:7.3.18
-    ports:
-      - "9102:9102"
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../../:/var/www/html
-      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/mch-spwan-start-lz:/usr/local/bin/docker-spwan-start
-    container_name: "panda-merchant"
-    command: [docker-spwan-start]
-    depends_on:
-       - "redisrv"
-
-  websrv:
-    image: php-fpm:alpine
-    ports:
-      - "9000:9000"
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../../:/var/www/html
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-      - ../../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
-    container_name: "panda-web"
-    command: [php-fpm]
-    depends_on:
-      - "redisrv"
-
   crontabsrv:
     image: php-zts-debug:7.3.18
     volumes:
@@ -118,29 +35,4 @@ services:
       - /mnt/shoplog:/var/www/html/data/log
       - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
     container_name: "panda-cronsec"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
-
-  wsdsrv:
-    image: php-zts-debug:7.3.18
-    ports:
-      - "60987:60987"
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../../:/var/www/html
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-    container_name: "panda-wsd"
-    command: [php,"/var/www/html/wsd_bridge.php"]
-
-  phpcli:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
-      - ../../../:/var/www/html
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-php"
-    depends_on:
-      - "redisrv"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']

docker/compose/xyzt-acc/docker-compose.yml

@@ -15,7 +15,6 @@ services:
     command: [nginx,'-g','daemon off;']
     extra_hosts:
       - "docker.hostip:172.17.0.1"
-#      - "eth.hostip:172.26.105.127"
 
   redisrv:
     image: redis:alpine

docker/compose/xyzt-arw/docker-compose.yml

@@ -0,0 +1,129 @@
+version: "3.7"
+
+services:
+  nginxsrv:
+    image: nginx:alpine
+    ports:
+      - "8080:80"
+    volumes:
+      - ../../../:/var/www/html
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - /nfs/upload:/var/www/html/data/upload
+      - /nfs/tmerchant:/var/www/html/merchant
+      - ../../conf/nginx/nginx-xyztest-http.conf:/etc/nginx/nginx.conf:ro
+    container_name: "panda-nginx"
+    command: [nginx,'-g','daemon off;']
+    extra_hosts:
+      - "docker.hostip:172.17.0.1"
+
+  redisrv:
+    image: redis:alpine
+    ports:
+      - "6379:6379"
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../conf/redis/6379.conf:/etc/redis/redis.conf
+      - /mnt/redisdata:/data
+    container_name: "panda-redis"
+    command: [redis-server,"/etc/redis/redis.conf"]
+
+  mobilesrv:
+    image: php-zts:7.3.18
+    ports:
+      - "9100:9100"
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
+    container_name: "panda-mobile"
+    command: ['docker-spwan-start']
+    depends_on:
+      - "redisrv"
+
+  raccsrv:
+    image: php-zts:7.3.18
+    ports:
+      - "9101:9101"
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../conf/php/racc-spwan-start-lz:/usr/local/bin/docker-spwan-start
+    container_name: "panda-racc"
+    command: [docker-spwan-start]
+    depends_on:
+      - "redisrv"
+
+  mchsrv:
+    image: php-zts:7.3.18
+    ports:
+      - "9102:9102"
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../conf/php/mch-spwan-start-lz:/usr/local/bin/docker-spwan-start
+    container_name: "panda-merchant"
+    command: [docker-spwan-start]
+    depends_on:
+       - "redisrv"
+
+  websrv:
+    image: php-fpm:alpine
+    ports:
+      - "9000:9000"
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
+    container_name: "panda-web"
+    command: [php-fpm]
+    depends_on:
+      - "redisrv"
+
+  crontabsrv:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/crontab/root:/var/spool/cron/crontabs/root
+    container_name: "panda-crontab"
+    command: [crond,"-f"]
+    depends_on:
+      - "redisrv"
+
+  cronsec:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+    container_name: "panda-cronsec"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
+
+  phpcli:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+    container_name: "panda-php"
+    depends_on:
+      - "redisrv"

docker/compose/xyzt/arw/docker-compose.yml

@@ -0,0 +1,106 @@
+version: "3.7"
+
+services:
+  nginxsrv:
+    image: nginx:alpine
+    ports:
+      - "8080:80"
+    volumes:
+      - ../../../../:/var/www/html
+      - ../../../conf/etc/localtime:/etc/localtime:ro
+      - /nfs/upload:/var/www/html/data/upload
+      - /nfs/tmerchant:/var/www/html/merchant
+      - ../../../conf/nginx/nginx-xyztest-http.conf:/etc/nginx/nginx.conf:ro
+    container_name: "panda-nginx"
+    command: [nginx,'-g','daemon off;']
+    extra_hosts:
+      - "docker.hostip:172.17.0.1"
+
+  mobilesrv:
+    image: php-zts:7.3.18
+    ports:
+      - "9100:9100"
+    volumes:
+      - ../../../../:/var/www/html
+      - ../../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
+    container_name: "panda-mobile"
+    command: ['docker-spwan-start']
+
+  mchsrv:
+    image: php-zts:7.3.18
+    ports:
+      - "9102:9102"
+    volumes:
+      - ../../../../:/var/www/html
+      - ../../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../../conf/php/mch-spwan-start-lz:/usr/local/bin/docker-spwan-start
+    container_name: "panda-merchant"
+    command: [docker-spwan-start]
+
+  websrv:
+    image: php-fpm:alpine
+    ports:
+      - "9000:9000"
+    volumes:
+      - ../../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+      - ../../../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
+    container_name: "panda-web"
+    command: [php-fpm]
+
+  cordsrv:
+    image: php-swool-redis:latest
+    volumes:
+      - ../../../../:/var/www/html
+      - ../../../conf/etc/localtime:/etc/localtime:ro
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../../conf/php/xyzt-php-swoole.ini:/usr/local/etc/php/php.ini
+    container_name: "worker-codispatcher"
+    command: [php,"/var/www/html/rdispatcher/codispatcher.php","16"]
+    deploy:
+      resources:
+        limits:
+          cpus: '8'
+
+  queuesrv:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../../../conf/etc/localtime:/etc/localtime:ro
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+    container_name: "worker-queue"
+    command: [php,"/var/www/html/queue/index.php", "queue", "index"]
+
+  searcher:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../../../conf/etc/localtime:/etc/localtime:ro
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+    container_name: "worker-searcher"
+    command: [php, "/var/www/html/searcher.php"]
+
+  phpcli:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+    container_name: "panda-php"

docker/compose/xyzt/storage/docker-compose.yml

@@ -0,0 +1,38 @@
+version: "3.7"
+
+services:
+  redisrv:
+    image: redis:alpine
+    ports:
+      - "6379:6379"
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../conf/redis/6379.conf:/etc/redis/redis.conf
+      - /mnt/redisdata:/data
+    container_name: "panda-redis"
+    command: [redis-server,"/etc/redis/redis.conf"]
+
+  crontabsrv:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/crontab/root:/var/spool/cron/crontabs/root
+    container_name: "panda-crontab"
+    command: [crond,"-f"]
+    depends_on:
+      - "redisrv"
+
+  cronsec:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
+    container_name: "panda-cronsec"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']