Fix Nginx configuration, namespace containers and clear docker-compose.yml

Fix comments

Author: Vincent Composieux

README.md

@@ -13,6 +13,14 @@ $ git clone git@github.com:eko/docker-symfony.git
 
 Next, put your Symfony application into `symfony` folder and do not forget to add `symfony.dev` in your `/etc/hosts` file.
 
+Now, you have to build your Docker images:
+
+```bash
+$ docker build -t symfony/code code
+$ docker build -t symfony/php-fpm php-fpm
+$ docker build -t symfony/nginx nginx
+```
+
 Then, run:
 
 ```bash

docker-compose.yml

@@ -1,34 +1,33 @@
 application:
-    image: code
+    image: symfony/code
     volumes:
-        - "symfony:/var/www/symfony"
-        - "logs/symfony:/var/www/symfony/app/logs"
+        - symfony:/var/www/symfony
+        - logs/symfony:/var/www/symfony/app/logs
     tty: true
 db:
     image: mysql
     ports:
-        - "3306:3306"
+        - 3306:3306
     environment:
         MYSQL_ROOT_PASSWORD: root
         MYSQL_DATABASE: symfony
         MYSQL_USER: root
         MYSQL_PASSWORD: root
 php:
-    image: php-fpm
+    image: symfony/php-fpm
     expose:
-        - "9000:9000"
+        - 9000:9000
     volumes_from:
         - application
     links:
         - db
 nginx:
-    image: nginx
+    image: symfony/nginx
     ports:
-        - "80:80"
+        - 80:80
     links:
         - php
     volumes_from:
         - application
     volumes:
-        - "logs/nginx/:/var/log/nginx"
-    hostname: symfony.dev
+        - logs/nginx/:/var/log/nginx

nginx/Dockerfile

@@ -12,7 +12,7 @@ RUN rm /etc/nginx/sites-enabled/default
 
 RUN echo "upstream php-upstream { server php:9000; }" > /etc/nginx/conf.d/upstream.conf
 
-WORKDIR /etc/nginx
+RUN usermod -u 1000 www-data
 
 CMD ["nginx"]
 

nginx/symfony.conf

@@ -2,22 +2,21 @@ server {
     server_name symfony.dev;
     root /var/www/symfony/web;
 
+
     location / {
-        # try to serve file directly, fallback to app.php
-        try_files $uri /app.php$is_args$args;
+        try_files $uri @rewriteapp;
+    }
+
+    location @rewriteapp {
+        rewrite ^(.*)$ /app.php/$1 last;
     }
 
-    # PROD
-    location ~ ^/app\.php(/|$) {
+    location ~ ^/(app|app_dev|config)\.php(/|$) {
         fastcgi_pass php-upstream;
         fastcgi_split_path_info ^(.+\.php)(/.*)$;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param HTTPS off;
-        # Prevents URIs that include the front controller. This will 404:
-        # http://domain.tld/app.php/some-path
-        # Remove the internal directive to allow URIs like this
-        internal;
     }
 
     error_log /var/log/nginx/symfony_error.log;

php-fpm/Dockerfile

@@ -9,6 +9,8 @@ ADD symfony.ini /etc/php5/cli/conf.d/
 
 ADD symfony.pool.conf /etc/php5/fpm/pool.d/
 
+RUN usermod -u 1000 www-data
+
 CMD ["php5-fpm", "-F"]
 
 EXPOSE 9000