debug

docker/compose/lz-acc/docker-compose.yml

@@ -38,6 +38,8 @@ services:
       - ../../conf/php/lz-mobile-spwan-start:/usr/local/bin/docker-spwan-start
     container_name: "panda-mobile"
     command: ['docker-spwan-start']
+    depends_on:
+      - "redisrv"
 
   raccsrv:
     image: php-zts-debug:7.3.18
@@ -52,6 +54,8 @@ services:
       - ../../conf/php/racc-spwan-start-lz:/usr/local/bin/docker-spwan-start
     container_name: "panda-racc"
     command: [docker-spwan-start]
+    depends_on:
+      - "redisrv"
 
   websrv:
     image: php-fpm:alpine
@@ -66,6 +70,8 @@ services:
       - ../../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
@@ -78,6 +84,8 @@ services:
       - ../../conf/crontab/root:/var/spool/cron/crontabs/root
     container_name: "panda-crontab"
     command: [crond,"-f"]
+    depends_on:
+      - "redisrv"
 
   phpcli:
     image: php-zts-debug:7.3.18
@@ -87,4 +95,6 @@ services:
       - ../../../:/var/www/html
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-php"
+    container_name: "panda-php"
+    depends_on:
+      - "redisrv"

docker/compose/xyz-acc/docker-compose.yml

@@ -8,8 +8,8 @@ services:
     volumes:
       - ../../../:/var/www/html
       - ../../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/merchant:/var/www/html/merchant
+      - /nfs/upload:/var/www/html/data/upload
+      - /nfs/merchant:/var/www/html/merchant
       - ../../conf/nginx/cert:/etc/nginx/cert
       - ../../conf/nginx/nginx-prod-https.conf:/etc/nginx/nginx.conf:ro
     container_name: "panda-nginx"

docker/compose/xyz-worker/docker-compose.yml

@@ -0,0 +1,45 @@
+version: "3.7"
+
+services:
+  rdsrv:
+    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/xyzt-45-php.ini:/usr/local/etc/php/php.ini
+    container_name: "panda-dispatcher"
+    command: [php,"/var/www/html/rdispatcher/dispatcher.php","1"]
+
+  queuesrv:
+    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/xyzt-45-php.ini:/usr/local/etc/php/php.ini
+    container_name: "panda-queue"
+    command: [php,"/var/www/html/queue/index.php", "queue", "index"]
+
+  searcher:
+    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/xyzt-45-php.ini:/usr/local/etc/php/php.ini
+    container_name: "panda-searcher"
+    command: [php, "/var/www/html/searcher.php"]
+
+#  phpcli:
+#    image: php-zts-debug:7.3.18
+#    volumes:
+#      - ../../conf/etc/localtime:/etc/localtime:ro
+#      - ../../conf/php/xyzt-45-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"

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

@@ -13,6 +13,10 @@ services:
       - ../../conf/nginx/nginx-acc-45-http.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.126"
+
 
   redisrv:
     image: redis:alpine

docker/conf/nginx/nginx-acc-45-http.conf

@@ -72,7 +72,7 @@ http
 
         location ~ /mobile/[/\w]+\.php$ {
             root           $folder_name;
-            fastcgi_pass   172.26.105.126:9100;
+            fastcgi_pass   docker.hostip:9100;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include fastcgi_params;
@@ -84,7 +84,7 @@ http
 
         location ~ /racc/[/\w]+\.php$ {
             root           $folder_name;
-            fastcgi_pass   172.26.105.126:9101;
+            fastcgi_pass   docker.hostip:9101;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include fastcgi_params;
@@ -93,7 +93,7 @@ http
         location ~ \.php$ {
 	        add_header Cache-Control no-store;
             root           $folder_name;
-            fastcgi_pass   172.26.105.126:9000;
+            fastcgi_pass   docker.hostip:9000;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include        fastcgi_params;