diff --git a/docker-compose.yml b/docker-compose.yml index 9425efa..0404e59 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,8 +23,6 @@ services: hostname: demo_php-fpm container_name: demo_php-fpm build: ./php - ports: - - "9000:9000" volumes: - ./php/etc:/usr/local/etc - ./wwwroot:/var/www/html:rw diff --git a/nginx/conf/conf.d/default.conf b/nginx/conf/conf.d/default.conf index ecc9599..67b51dc 100644 --- a/nginx/conf/conf.d/default.conf +++ b/nginx/conf/conf.d/default.conf @@ -2,6 +2,8 @@ server { listen 80; server_name localhost; + root /var/www/html; + #charset koi8-r; #access_log /var/log/nginx/host.access.log main; @@ -28,8 +30,8 @@ server { # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 # location ~ \.php { - #fastcgi_pass 127.0.0.1:9000; - fastcgi_pass unix:/sock/php-cgi.sock; + fastcgi_pass php-fpm:9000; + #fastcgi_pass unix:/sock/php-cgi.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include fastcgi_params;