stanley-king 2 yıl önce
ebeveyn
işleme
855f2e14e7

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

@@ -4,9 +4,9 @@ services:
   phpcli:
     image: php-zts-debug:7.3.18
     volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - /mnt/xyzshop:/var/www/html
+      - /mnt/xyzshop/docker/compose/stanlinux/conf/etc/localtime:/etc/localtime:ro
+      - /mnt/xyzshop/docker/compose/stanlinux/conf/php/php.ini:/usr/local/etc/php/php.ini
       - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-php"
@@ -33,6 +33,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../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/vender-init:/usr/local/bin/vender-init
     container_name: "panda-vender"
@@ -41,7 +42,7 @@ services:
   pythoncli:
     image: pycpu:3.7.10
     volumes:
-      - ../conf/etc/localtime:/etc/localtime:ro
+      - /mnt/xyzshop/docker/compose/stanlinux/conf/etc/localtime:/etc/localtime:ro
       - ../../../../:/var/www/html
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata

+ 1 - 11
docker/compose/stanlinux/worker/docker-compose.yml

@@ -36,14 +36,4 @@ services:
       - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-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/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-php"
+    command: [php, "/var/www/html/searcher.php"]

+ 0 - 1
test/TestRefillClear.php

@@ -24,7 +24,6 @@ class TestRefillClear extends TestCase
     {
         $start_date = strtotime('2021-09-11');
         $end_date   = strtotime('2021-09-13');
-
         $clear = new refill\order_clear();
         $clear->clear($start_date,$end_date);
     }