stanley-king 1 vuosi sitten
vanhempi
commit
a89fb37541
38 muutettua tiedostoa jossa 84 lisäystä ja 5 poistoa
  1. 1 0
      application/index/controller/Index.php
  2. 0 0
      docker/acc/docker-compose-mac.yml
  3. 0 0
      docker/acc/docker-compose-test.yml
  4. 0 0
      docker/acc/docker-compose-win.yml
  5. 5 5
      docker-compose-windows.yml
  6. 78 0
      docker/acc/docker-compose.yml
  7. 0 0
      docker/conf/crontab/docker-start
  8. 0 0
      docker/conf/crontab/root
  9. 0 0
      docker/conf/etc/localtime
  10. 0 0
      docker/conf/nginx/cert/www.xyzshops.cn.key
  11. 0 0
      docker/conf/nginx/cert/www.xyzshops.cn.pem
  12. 0 0
      docker/conf/nginx/fastcgi.conf
  13. 0 0
      docker/conf/nginx/fastcgi.conf.default
  14. 0 0
      docker/conf/nginx/fastcgi_params
  15. 0 0
      docker/conf/nginx/koi-utf
  16. 0 0
      docker/conf/nginx/koi-win
  17. 0 0
      docker/conf/nginx/lrlzssl/214455844540210.key
  18. 0 0
      docker/conf/nginx/lrlzssl/214455844540210.pem
  19. 0 0
      docker/conf/nginx/mime.types
  20. 0 0
      docker/conf/nginx/nginx-debug-http.conf
  21. 0 0
      docker/conf/nginx/nginx-prod-http.conf
  22. 0 0
      docker/conf/nginx/nginx-prod-https.conf
  23. 0 0
      docker/conf/nginx/nginx-test-http.conf
  24. 0 0
      docker/conf/nginx/scgi_params
  25. 0 0
      docker/conf/nginx/uwsgi_params
  26. 0 0
      docker/conf/nginx/win-utf
  27. 0 0
      docker/conf/php-fpm/docker-php-fpm-start
  28. 0 0
      docker/conf/php-fpm/php-debug.ini
  29. 0 0
      docker/conf/php-fpm/php-fpm.conf
  30. 0 0
      docker/conf/php-fpm/php.ini
  31. 0 0
      docker/conf/php/docker-php-spwan-start
  32. 0 0
      docker/conf/php/docker-php-start
  33. 0 0
      docker/conf/php/php-debug.ini
  34. 0 0
      docker/conf/php/php.ini
  35. 0 0
      docker/conf/queue/docker-queue-start
  36. 0 0
      docker/conf/redis/6379.conf
  37. 0 0
      docker/conf/redis/6380.conf
  38. 0 0
      docker/conf/searcher/docker-search-start

+ 1 - 0
application/index/controller/Index.php

@@ -21,6 +21,7 @@ class Index
         }
         pre($result);
     }
+
     //检查订单号码
     public function CheckOrder(){
         $order_sn = input('param.order_sn');

docker-compose-mac.yml → docker/acc/docker-compose-mac.yml


docker-compose-test.yml → docker/acc/docker-compose-test.yml


docker-compose-win.yml → docker/acc/docker-compose-win.yml


+ 5 - 5
docker-compose-windows.yml

@@ -12,7 +12,7 @@ services:
     links:
       - accfpm
     container_name: "acc-nginx"
-    command: [nginx,'-g','daemon off;']
+    command: [ nginx,'-g','daemon off;' ]
 
   accfpm:
     image: php-fpm:alpine
@@ -23,7 +23,7 @@ services:
       - /d/zng/access/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
       - /d/zng/access/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
     container_name: "acc-web"
-    command: [docker-php-fpm-start]
+    command: [ docker-php-fpm-start ]
     depends_on:
       - accredis
 
@@ -42,7 +42,7 @@ services:
     volumes:
       - /d/zng/access/conf/etc/localtime:/etc/localtime:ro
     container_name: "acc-redis"
-    command: [ "redis-server"]
+    command: [ "redis-server" ]
 
   accqueue:
     image: php-zts-debug:7.3.18
@@ -52,7 +52,7 @@ services:
       - /d/zng/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - /d/zng/access/conf/queue/docker-queue-start:/usr/local/bin/docker-queue-start
     container_name: "acc-queue"
-    command: [docker-queue-start]
+    command: [ docker-queue-start ]
 
   acccrontab:
     image: php-zts-debug:7.3.18
@@ -63,4 +63,4 @@ services:
       - /d/zng/access/conf/crontab/root:/var/spool/cron/crontabs/root
       - /d/zng/access/conf/crontab/docker-start:/usr/local/bin/docker-start
     container_name: "acc-crontab"
-    command: [docker-start]
+    command: [ docker-start ]

+ 78 - 0
docker/acc/docker-compose.yml

@@ -0,0 +1,78 @@
+version: "3.7"
+
+services:
+  accnginx:
+    image: nginx:alpine
+    ports:
+      - "8088:80"
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+      - $PWD/conf/nginx/nginx-test-http.conf:/etc/nginx/nginx.conf:ro
+      - $PWD:/var/www/html
+    links:
+      - accfpm
+    container_name: "acc-nginx"
+    command: [nginx,'-g','daemon off;']
+
+  accfpm:
+    image: php-fpm:alpine
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+      - $PWD:/var/www/html
+      - $PWD/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
+      - $PWD/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
+      - $PWD/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
+    container_name: "acc-web"
+    command: [docker-php-fpm-start]
+    depends_on:
+      - accredis
+    extra_hosts:
+      - "docker.hostip:172.18.0.1"
+      - "eth.hostip:172.17.153.106"
+
+  accphp:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+      - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - $PWD:/var/www/html
+    links:
+      - accredis
+    container_name: "acc-php"
+    extra_hosts:
+      - "docker.hostip:172.18.0.1"
+      - "eth.hostip:172.17.153.106"
+
+  accredis:
+    image: redis:alpine
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+    container_name: "acc-redis"
+    command: [ "redis-server"]
+
+  accqueue:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+      - $PWD:/var/www/html
+      - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - $PWD/conf/queue/docker-queue-start:/usr/local/bin/docker-queue-start
+    container_name: "acc-queue"
+    command: [docker-queue-start]
+    extra_hosts:
+      - "docker.hostip:172.18.0.1"
+      - "eth.hostip:172.17.153.106"
+
+  acccrontab:
+    image: php-zts-debug:7.3.18
+    volumes:
+        - $PWD/conf/etc/localtime:/etc/localtime:ro
+        - $PWD:/var/www/html
+        - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+        - $PWD/conf/crontab/root:/var/spool/cron/crontabs/root
+        - $PWD/conf/crontab/docker-start:/usr/local/bin/docker-start
+    container_name: "acc-crontab"
+    command: [docker-start]
+    extra_hosts:
+      - "docker.hostip:172.18.0.1"
+      - "eth.hostip:172.17.153.106"

conf/crontab/docker-start → docker/conf/crontab/docker-start


conf/crontab/root → docker/conf/crontab/root


conf/etc/localtime → docker/conf/etc/localtime


conf/nginx/cert/www.xyzshops.cn.key → docker/conf/nginx/cert/www.xyzshops.cn.key


conf/nginx/cert/www.xyzshops.cn.pem → docker/conf/nginx/cert/www.xyzshops.cn.pem


conf/nginx/fastcgi.conf → docker/conf/nginx/fastcgi.conf


conf/nginx/fastcgi.conf.default → docker/conf/nginx/fastcgi.conf.default


conf/nginx/fastcgi_params → docker/conf/nginx/fastcgi_params


conf/nginx/koi-utf → docker/conf/nginx/koi-utf


conf/nginx/koi-win → docker/conf/nginx/koi-win


conf/nginx/lrlzssl/214455844540210.key → docker/conf/nginx/lrlzssl/214455844540210.key


conf/nginx/lrlzssl/214455844540210.pem → docker/conf/nginx/lrlzssl/214455844540210.pem


conf/nginx/mime.types → docker/conf/nginx/mime.types


conf/nginx/nginx-debug-http.conf → docker/conf/nginx/nginx-debug-http.conf


conf/nginx/nginx-prod-http.conf → docker/conf/nginx/nginx-prod-http.conf


conf/nginx/nginx-prod-https.conf → docker/conf/nginx/nginx-prod-https.conf


conf/nginx/nginx-test-http.conf → docker/conf/nginx/nginx-test-http.conf


conf/nginx/scgi_params → docker/conf/nginx/scgi_params


conf/nginx/uwsgi_params → docker/conf/nginx/uwsgi_params


conf/nginx/win-utf → docker/conf/nginx/win-utf


conf/php-fpm/docker-php-fpm-start → docker/conf/php-fpm/docker-php-fpm-start


conf/php-fpm/php-debug.ini → docker/conf/php-fpm/php-debug.ini


conf/php-fpm/php-fpm.conf → docker/conf/php-fpm/php-fpm.conf


conf/php-fpm/php.ini → docker/conf/php-fpm/php.ini


conf/php/docker-php-spwan-start → docker/conf/php/docker-php-spwan-start


conf/php/docker-php-start → docker/conf/php/docker-php-start


conf/php/php-debug.ini → docker/conf/php/php-debug.ini


conf/php/php.ini → docker/conf/php/php.ini


conf/queue/docker-queue-start → docker/conf/queue/docker-queue-start


conf/redis/6379.conf → docker/conf/redis/6379.conf


conf/redis/6380.conf → docker/conf/redis/6380.conf


conf/searcher/docker-search-start → docker/conf/searcher/docker-search-start