diff --git a/docker/config/nginx/conf.d/sport-era.dev.conf b/docker/config/nginx/conf.d/sport-era.dev.conf index 82a194b..5b851fc 100644 --- a/docker/config/nginx/conf.d/sport-era.dev.conf +++ b/docker/config/nginx/conf.d/sport-era.dev.conf @@ -1,5 +1,5 @@ server { - listen 8000; + listen 8100; server_name _; root /likeadmin_php/server/public; index index.html index.htm index.php; @@ -17,7 +17,7 @@ server { location ~ \.php$ { include fastcgi_params; - fastcgi_pass 127.0.0.1:9000; + fastcgi_pass 127.0.0.1:9100; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME /likeadmin_php/server/public$fastcgi_script_name; } diff --git a/docker/config/php/php-fpm.dev.conf b/docker/config/php/php-fpm.dev.conf new file mode 100644 index 0000000..b9cb3e5 --- /dev/null +++ b/docker/config/php/php-fpm.dev.conf @@ -0,0 +1,3 @@ +[www] +listen = 127.0.0.1:9100 +listen.allowed_clients = 127.0.0.1 diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 0d1d041..bbc7adb 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -15,6 +15,7 @@ services: volumes: - ../server:/likeadmin_php/server - ./.env.server:/likeadmin_php/server/.env:ro + - ./config/php/php-fpm.dev.conf:/usr/local/etc/php-fpm.d/zz-dev-fpm.conf:ro scheduler: <<: *php-image @@ -26,6 +27,7 @@ services: volumes: - ../server:/likeadmin_php/server - ./.env.server:/likeadmin_php/server/.env:ro + - ./config/php/php-fpm.dev.conf:/usr/local/etc/php-fpm.d/zz-dev-fpm.conf:ro crawler: container_name: sport-era-crawler @@ -72,7 +74,7 @@ services: sh -c "if [ ! -d node_modules/vite ]; then npm install --package-lock=false; fi; npm run dev" ports: - - "5176:5176" + - "5186:5176" volumes: - ../admin:/app - admin-node-modules:/app/node_modules @@ -89,7 +91,7 @@ services: sh -c "if [ ! -x node_modules/.bin/uni ]; then npm install --legacy-peer-deps --package-lock=false; fi; npm run dev:h5 -- --host 0.0.0.0" ports: - - "5177:5177" + - "5187:5177" volumes: - ../uniapp:/app - uniapp-node-modules:/app/node_modules