diff --git a/Dockerfile b/Dockerfile index da10640..18e0966 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,8 @@ RUN composer install RUN php artisan key:generate # Expose port 9000 for PHP-FPM +EXPOSE 80 EXPOSE 9001 # Start PHP-FPM -CMD ["php-fpm"] +CMD ["nginx", "-g", "daemon off;", "&", "php-fpm"] diff --git a/default.conf b/default.conf index 9c02997..cb2f91c 100644 --- a/default.conf +++ b/default.conf @@ -5,27 +5,23 @@ server { root /var/www/html; index index.php index.html; - - index index.php; - location / { try_files $uri $uri/ /index.php?$query_string; } - location ~ \.php { - fastcgi_index index.php; - fastcgi_pass unix:/var/run/php/php5.6-fpm.sock; - - include fastcgi_params; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + location ~ \.php { + fastcgi_index index.php; + fastcgi_pass php-fpm:9001; # Use the service name and exposed port + include fastcgi_params; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } location ~* \.(css|less|js|jpg|png|gif)$ { - add_header Cache-Control "no-cache, no-store, must-revalidate"; - add_header Pragma "no-cache"; - expires 0; + add_header Cache-Control "no-cache, no-store, must-revalidate"; + add_header Pragma "no-cache"; + expires 0; } -} \ No newline at end of file +}