Merge branch '1057-add-xdebug-to-docker-installation' into 'development'

Resolve "add xdebug to docker installation"

Closes #1057

See merge request !1760

.gitignore

@@ -6,7 +6,6 @@ Homestead.json
 Homestead.yaml
 .env
 .orig
-.vscode
 langfiles.zip
 npm-debug.log
 # The Files created by Webpack in the build process

.vscode/launch.json

+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "PHP - Listen for XDebug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000,
+            "pathMappings": {
+                "/html": "${workspaceRoot}"
+            }
+        },
+        {
+            "name": "PHP - Launch currently open script",
+            "type": "php",
+            "request": "launch",
+            "port": 9000,
+            "program": "${file}",
+            "cwd": "${fileDirname}",
+            "pathMappings": {
+                "/html": "${workspaceRoot}"
+            }
+        }
+    ]
+}
\ No newline at end of file

DockerfileDev

@@ -24,6 +24,7 @@ RUN apk add --update \
     php7-json \
     php7-pcntl \
     php7-fileinfo \
+    php7-xdebug \
     && rm -rf /var/cache/apk/*
 
 WORKDIR /html
@@ -31,7 +32,7 @@ WORKDIR /html
 RUN sed -i 's/;error_log = log\/php7\/error.log/error_log = \/dev\/stderr/g' /etc/php7/php-fpm.conf && \
     sed -i 's/;daemonize = yes/daemonize = no/g' /etc/php7/php-fpm.conf && \
     sed -i 's/listen = 127.0.0.1:9000/listen = 9000/g' /etc/php7/php-fpm.d/www.conf && \
-    sed -i 's/;request_terminate_timeout = 0/request_terminate_timeout = 30/g' /etc/php7/php-fpm.d/www.conf && \
+    sed -i 's/;request_terminate_timeout = 0/request_terminate_timeout = 900/g' /etc/php7/php-fpm.d/www.conf && \
     sed -i 's/;request_terminate_timeout_track_finished = no/request_terminate_timeout_track_finished = yes/g' /etc/php7/php-fpm.d/www.conf && \
     sed -i 's/;decorate_workers_output = no/decorate_workers_output = no/g' /etc/php7/php-fpm.d/www.conf && \
     sed -i 's/;catch_workers_output = yes/catch_workers_output = yes/g' /etc/php7/php-fpm.d/www.conf && \
@@ -45,6 +46,11 @@ RUN sed -i 's/;error_log = log\/php7\/error.log/error_log = \/dev\/stderr/g' /et
     sed -i 's/group = www-data/group = nginx/g' /etc/php7/php-fpm.d/www.conf && \
     sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php7/php.ini && \
     sed -i 's/expose_php = On/expose_php = Off/g' /etc/php7/php.ini && \
+    sed -i 's/;zend_extension=xdebug.so/zend_extension=xdebug.so/g' /etc/php7/conf.d/xdebug.ini && \
+    echo "xdebug.remote_enable = 1" >> /etc/php7/conf.d/xdebug.ini && \
+    echo "xdebug.remote_autostart = 1" >> /etc/php7/conf.d/xdebug.ini && \
+    echo "xdebug.remote_connect_back = 1" >> /etc/php7/conf.d/xdebug.ini && \
+    echo "xdebug.idekey=VSCODE" >> /etc/php7/conf.d/xdebug.ini && \
     echo "daemonize yes" >> /etc/redis.conf && \
     ln -s /dev/null /var/log/nginx/access.log && \
     ln -s /dev/stdout /var/log/nginx/error.log && \

config/nginx-default-dev.conf

+server {
+    listen       80;
+    server_name  localhost;
+    root   /html/public;
+    index  index.php index.html index.htm;
+
+    #charset koi8-r;
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location ~ \.php$ {
+        try_files $uri /index.php =404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass phpfpm:9000;
+        fastcgi_index index.php;
+        fastcgi_read_timeout 900;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        include fastcgi_params;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+}
\ No newline at end of file

docker-compose.yml

@@ -56,7 +56,7 @@ services:
     volumes:
       - .:/html
       - ./config/nginx.conf:/etc/nginx/nginx.conf
-      - ./config/nginx-default.conf:/etc/nginx/conf.d/default.conf
+      - ./config/nginx-default-dev.conf:/etc/nginx/conf.d/default.conf
     ports: 
     - "8080:80"
   worker: