diff --git a/base_d7/index.html b/base_d7/index.php similarity index 86% rename from base_d7/index.html rename to base_d7/index.php index e50405e..0cc0a9c 100644 --- a/base_d7/index.html +++ b/base_d7/index.php @@ -6,5 +6,6 @@

Hello world!

+ diff --git a/docker-compose.yml b/docker-compose.yml index 51c4251..e4503ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,8 +10,20 @@ services: - "${LOG_ROOT}:/var/log:rw" networks: - server + depends_on: + - php + + php: + build: ./php/ + expose: + - 9000 + volumes: + - "${PROJECT_ROOT}:/var/www/html" + networks: + # - database + - server # depends_on: - # - php + # - mysql networks: server: diff --git a/nginx/default.conf b/nginx/default.conf index 6e3f20f..83f32f4 100644 --- a/nginx/default.conf +++ b/nginx/default.conf @@ -19,16 +19,16 @@ server { client_max_body_size 100m; - # location ~ \.php$ { - # fastcgi_split_path_info ^(.+\.php)(/.+)$; - # fastcgi_pass php:9000; - # fastcgi_index index.php; - # include fastcgi_params; - # fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - # fastcgi_intercept_errors off; - # fastcgi_buffer_size 16k; - # fastcgi_buffers 4 16k; - # } + location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_intercept_errors off; + fastcgi_buffer_size 16k; + fastcgi_buffers 4 16k; + } location ~ /\.ht { deny all; diff --git a/php/Dockerfile b/php/Dockerfile new file mode 100644 index 0000000..d6e9ff1 --- /dev/null +++ b/php/Dockerfile @@ -0,0 +1,3 @@ +FROM php:5.6-fpm + +# RUN docker-php-ext-install pdo_mysql