[docker] improved docker configuration

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3"
 services:
     nginx:
         image: nginx:alpine
-        container_name: yawik.nginx
+        container_name: ${DOCKER_CONTAINER_NAME}.nginx
         volumes:
             - ./etc/docker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf
             - ./:/var/www/yawik
@@ -15,15 +15,14 @@ services:
             - UMASK="0000"
 
     php:
-        container_name: yawik.php
+        container_name: ${DOCKER_CONTAINER_NAME}.php
         env_file:
           - .env
         build:
             context: etc/docker/php
             args:
                 TIMEZONE: ${TIMEZONE}
         volumes:
-            - ./etc/docker/php/php-ini-overrides.ini:/usr/local/etc/php/conf.d/99-overrides.ini
             - ./:/var/www/yawik
         links:
             - mongo
@@ -32,12 +31,12 @@ services:
 
     mongo:
         image: mongo:3.4.10
-        container_name: yawik.mongo
+        container_name: ${DOCKER_CONTAINER_NAME}.mongo
         environment:
             - MONGO_DATA_DIR=/data/db
             - MONGO_LOG_DIR=/dev/null
         volumes:
-            - ./var/mongodb:/data/db
+            - ./etc/docker/mongodb/data:/data/db
         ports:
             - "27017:27017"
         command: mongod --smallfiles --logpath=/dev/null # --quiet

etc/docker/mongodb/.gitignore

@@ -0,0 +1 @@
+/data

etc/docker/php/.gitignore

@@ -0,0 +1 @@
+/php-ini-overrides.ini

etc/docker/php/docker-entrypoint.sh

@@ -1,13 +1,24 @@
 #!/bin/sh
 set -e
 
+echo $PWD
+PHP_INI_OVERRIDE="etc/docker/php/php-ini-overrides.ini"
+if [ ! -f ${PHP_INI_OVERRIDE} ]; then
+    # just using default configuration
+    PHP_INI_OVERRIDE="etc/docker/php/php-ini-overrides.ini.dist";
+fi
+
+TARGET=/usr/local/etc/php/conf.d/99-overrides.ini
+cp -v ${PHP_INI_OVERRIDE} ${TARGET}
+
+export DOCKER_ENV="yes"
+
 # first arg is `-f` or `--some-option`
 if [ "${1#-}" != "$1" ]; then
 	set -- php-fpm "$@"
 fi
 
-# start selenium server
-#./bin/start-selenium > /dev/null 2>&1 &
+./bin/console clear-cache
 umask 0000
 chmod 777 var/cache -Rf
 chmod 777 var/log -Rf

etc/docker/php/php-ini-overrides.ini

@@ -1,8 +1,8 @@
 upload_max_filesize = 10000M
 post_max_size = 10008M
-xdebug.remote_host="172.23.0.1"
+xdebug.remote_host="172.30.0.1"
 xdebug.remote_port=9001
-xdebug.idekey=PHPSTORM
 xdebug.remote_enable=1
+xdebug.remote_connect_back=1
 xdebug.remote_autostart=1
-xdebug.remote_connect_back=1
+xdebug.idekey=PHPSTORM

etc/docker/php/php-ini-overrides.ini.dist

@@ -0,0 +1,8 @@
+upload_max_filesize = 10000M
+post_max_size = 10008M
+xdebug.remote_host="172.23.0.1"
+xdebug.remote_port=9001
+xdebug.idekey=PHPSTORM
+xdebug.remote_enable=1
+xdebug.remote_autostart=1
+xdebug.remote_connect_back=1