Merge branch 'test' of 39.97.239.116:gyfl/access into test

docker-compose-windows.yml

@@ -4,11 +4,19 @@ services:
   accnginx:
     image: nginx:alpine
     ports:
+<<<<<<< HEAD
+      - "8088:8088"
+    volumes:
+      - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
+      - /d/phpstudy_pro/WWW/access/conf/nginx/nginx-debug-http.conf:/etc/nginx/nginx.conf:ro
+      - /d/phpstudy_pro/WWW/access:/var/www/html
+=======
       - "8088:80"
     volumes:
       - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
       - d/phpstudy_pro/WWW/access/conf/nginx/nginx-test-http.conf:/etc/nginx/nginx.conf:ro
       - d/phpstudy_pro/WWW/access:/var/www/html
+>>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     links:
       - accfpm
     container_name: "acc-nginx"
@@ -17,11 +25,19 @@ services:
   accfpm:
     image: php-fpm:alpine
     volumes:
+<<<<<<< HEAD
+      - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
+      - /d/phpstudy_pro/WWW/access:/var/www/html
+      - /d/phpstudy_pro/WWW/access/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
+      - /d/phpstudy_pro/WWW/access/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
+      - /d/phpstudy_pro/WWW/access/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
+=======
       - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
       - d/phpstudy_pro/WWW/access:/var/www/html
       - d/phpstudy_pro/WWW/access/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
       - d/phpstudy_pro/WWW/access/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
       - d/phpstudy_pro/WWW/access/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
+>>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     container_name: "acc-web"
     command: [docker-php-fpm-start]
     depends_on:
@@ -30,9 +46,15 @@ services:
   accphp:
     image: php-zts-debug:7.3.18
     volumes:
+<<<<<<< HEAD
+      - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
+      - /d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - /d/phpstudy_pro/WWW/access:/var/www/html
+=======
       - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
       - d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - d/phpstudy_pro/WWW/access:/var/www/html
+>>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     links:
       - accredis
     container_name: "acc-php"
@@ -40,27 +62,46 @@ services:
   accredis:
     image: redis:alpine
     volumes:
+<<<<<<< HEAD
+      - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
+=======
       - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
+>>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     container_name: "acc-redis"
     command: [ "redis-server"]
 
   accqueue:
     image: php-zts-debug:7.3.18
     volumes:
+<<<<<<< HEAD
+      - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
+      - /d/phpstudy_pro/WWW/access:/var/www/html
+      - /d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - /d/phpstudy_pro/WWW/access/conf/queue/docker-queue-start:/usr/local/bin/docker-queue-start
+=======
       - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
       - d/phpstudy_pro/WWW/access:/var/www/html
       - d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - d/phpstudy_pro/WWW/access/conf/queue/docker-queue-start:/usr/local/bin/docker-queue-start
+>>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     container_name: "acc-queue"
     command: [docker-queue-start]
 
   acccrontab:
     image: php-zts-debug:7.3.18
     volumes:
+<<<<<<< HEAD
+      - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
+      - /d/phpstudy_pro/WWW/access:/var/www/html
+      - /d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - /d/phpstudy_pro/WWW/access/conf/crontab/root:/var/spool/cron/crontabs/root
+      - /d/phpstudy_pro/WWW/access/conf/crontab/docker-start:/usr/local/bin/docker-start
+=======
       - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
       - d/phpstudy_pro/WWW/access:/var/www/html
       - d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - d/phpstudy_pro/WWW/access/conf/crontab/root:/var/spool/cron/crontabs/root
       - d/phpstudy_pro/WWW/access/conf/crontab/docker-start:/usr/local/bin/docker-start
+>>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     container_name: "acc-crontab"
     command: [docker-start]