Merge pull request #6 from andrzejenne/master

xdebug, mailhog, php-fpm dockerfile fixes

bin/variables

@@ -12,3 +12,5 @@ export DOCKER_IMAGE_FOLDER="images" # used in Dockerfiles as relative path to th
 export MAGENTO_DIRECTORY=${APP_DIRECTORY}/magento
 
 export NUXT_DIRECTORY=${APP_DIRECTORY}/nuxt
+
+export CLI_XDEBUG_SERVER_NAME=magento.local

bin/xdebug/cli

@@ -5,19 +5,10 @@
 cd ${DOCKER_DIRECTORY}
 
 if [ -z $1 ]
-then echo "First argument has to be relative path (magento/<FILE_PATH>) to target file";
+then echo "First argument has to be relative path (<FILE_PATH>) to target file";
   exit;
-else
-  FILE_PATH=$1
 fi
 
-if [ -z $2 ]
-then
-  SERVER_NAME="magento.local"
-else
-  SERVER_NAME=$2
-fi
-
-bin/run/php-fpm sh -c "export XDEBUG_SESSION=1 && export PHP_IDE_CONFIG=\"serverName=$SERVER_NAME\" && php magento/$FILE_PATH"
+docker-compose exec -e XDEBUG_SESSION=1 -e PHP_IDE_CONFIG="serverName=$CLI_XDEBUG_SERVER_NAME" php-fpm "$@"
 
 cd ${APP_DIRECTORY}

bin/xdebug/mode

@@ -27,15 +27,16 @@
 # trace
 # - Enables the Function Trace feature, which allows you record every function call, including arguments, variable assignment, and return value that is made during a request to a file.
 
-if [ $(uname) == "Darwin" ]
+cd ${DOCKER_DIRECTORY}
+
+if [ $(uname) = "Darwin" ]
 then
-    sed -i '' "s/xdebug.mode=.*/xdebug.mode=$1/g" ${DOCKER_DIRECTORY}/images/php-fpm/php.ini
+  docker-compose exec php-fpm sed -i '' "s/xdebug.mode=.*/xdebug.mode=$1/g" /usr/local/etc/php/php.ini
 else
-  sed -i "s/xdebug.mode=.*/xdebug.mode=$1/g" ${DOCKER_DIRECTORY}/images/php-fpm/php.ini
+  docker-compose exec php-fpm sed -i "s/xdebug.mode=.*/xdebug.mode=$1/g" /usr/local/etc/php/php.ini
 fi
 
-cd ${DOCKER_DIRECTORY}
-
-docker-compose restart php-fpm
+echo "reloading php-fpm configuration"
+docker-compose exec php-fpm kill -USR2 1
 
 cd ${APP_DIRECTORY}

docker-compose.yml

@@ -16,9 +16,11 @@ services:
     networks:
       - external
       - internal
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
       - $MAGENTO_DIRECTORY:/home/dockeruser/magento
-      - $DOCKER_DIRECTORY/images/php-fpm/php.ini:/usr/local/etc/php/php.ini
+      - $DOCKER_DIRECTORY/images/php-fpm/custom-php.ini:/usr/local/etc/php/conf.d/custom-php.ini
       - $DOCKER_DIRECTORY/images/php-fpm/.composer:/home/dockeruser/.composer
 
   node:
@@ -54,6 +56,7 @@ services:
       - kibana
       - rabbitmq
       - redis-admin
+      - mailhog
     networks:
       - external
     ports:
@@ -196,6 +199,7 @@ services:
     container_name: docker-magento_mailhog
     networks:
       - internal
+      - external
 
 networks:
   internal:

images/nginx/default.conf

@@ -52,6 +52,17 @@ server {
     }
 }
 
+server {
+    server_name "mailhog.magento.local";
+
+    listen 8080;
+    listen [::]:8080;
+
+    location / {
+        proxy_pass http://mailhog:8025;
+    }
+}
+
 server {
     server_name "nuxt.magento.local";
 

images/php-fpm/Dockerfile

@@ -54,8 +54,10 @@ RUN addgroup -g $GROUP_ID -S dockeruser
 
 RUN adduser -S -G dockeruser -u $USER_ID -s /bin/ash dockeruser
 
+RUN chown -R dockeruser: /usr/local/etc/php
+
 USER dockeruser
 
-WORKDIR /home/dockeruser
+WORKDIR /home/dockeruser/magento
 
 EXPOSE 9000

images/php-fpm/custom-php.ini

@@ -0,0 +1 @@
+; php.ini customization, feel free to edit

images/php-fpm/php.ini

@@ -1,3 +1,5 @@
+; do not edit, used during image build
+[php]
 memory_limit = 2G
 max_execution_time = 1800
 zlib.output_compression = On
@@ -12,3 +14,6 @@ xdebug.mode=off
 xdebug.client_host="host.docker.internal"
 xdebug.start_with_request=yes
 xdebug.discover_client_host = 1
+
+[mail]
+sendmail_path = /usr/sbin/sendmail -S mailhog:1025