stanley-king 2 년 전
부모
커밋
d3aad53421

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

@@ -9,8 +9,8 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/merchant:/var/www/html/merchant
+      - /data/shop_share/upload:/var/www/html/data/upload
+      - /data/shop_share/merchant:/var/www/html/merchant
     container_name: "panda-nginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts:
@@ -28,7 +28,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/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"
@@ -46,7 +46,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/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"

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

@@ -10,7 +10,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/php/mch-spwan-start:/usr/local/bin/docker-spwan-start
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-merchant"
     command: [docker-spwan-start]
@@ -28,7 +28,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-web"
     command: [php-fpm]

+ 4 - 5
docker/compose/homecuda/cli/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       - /mnt/xyzshop:/var/www/html
       - /mnt/xyzshop/docker/compose/homecuda/conf/etc/localtime:/etc/localtime:ro
       - /mnt/xyzshop/docker/compose/homecuda/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-php"
     deploy:
@@ -21,7 +21,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php-swoole.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - ../conf/php/vender-init:/usr/local/bin/vender-init
     container_name: "panda-swoole"
@@ -31,11 +31,10 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/vender-init:/usr/local/bin/vender-init
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
-      - ../conf/php/vender-init:/usr/local/bin/vender-init
     container_name: "panda-vender"
     command: ['vender-init']
 

+ 3 - 3
docker/compose/homecuda/master-crond/docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/crontab/root:/var/spool/cron/crontabs/root
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-crontab"
     command: [crond,"-f"]
@@ -19,7 +19,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-cronsec"
     command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
@@ -30,7 +30,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-accedit"
     command: [php,"/var/www/html/crontab/index.php",'minutes','account_edit']

+ 0 - 1
docker/compose/homecuda/plot/docker-compose.yml

@@ -8,7 +8,6 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-flask"

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

@@ -8,7 +8,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-slavecron"
     command: [crond,"-f"]
@@ -24,7 +24,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-taska"
     command: [php,"/var/www/html/crontab/index.php",'minutes','task']
@@ -40,7 +40,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-taskb"
     command: [php,"/var/www/html/crontab/index.php",'minutes','task']
@@ -55,7 +55,7 @@ services:
       - ../../../../:/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
+      - /data/shop_share/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']

+ 0 - 4
docker/compose/homecuda/statcalc/docker-compose.yml

@@ -6,7 +6,6 @@ services:
     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"
@@ -17,7 +16,6 @@ services:
     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-mpratios"
@@ -28,7 +26,6 @@ services:
     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-mtimesratios"
@@ -39,7 +36,6 @@ services:
     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-chspeedratio"

+ 0 - 1
docker/compose/homecuda/statwriter/docker-compose.yml

@@ -6,7 +6,6 @@ services:
     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-qreader"

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

@@ -7,7 +7,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php-swoole-debug.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/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","1"]
@@ -22,7 +22,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-queue"
     command: [php,"/var/www/html/queue/index.php", "queue", "index"]
@@ -33,7 +33,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-searcher"
     command: [php, "/var/www/html/searcher.php"]