From ade7927ed5f7d930502df7607f39d0589277916d Mon Sep 17 00:00:00 2001 From: Pascal Krason Date: Tue, 27 Mar 2018 11:32:07 +0200 Subject: [PATCH 1/6] Added xdebug --- .DS_Store | Bin 0 -> 8196 bytes docker-compose.yml | 2 ++ php-fpm/Dockerfile | 5 +++-- php-fpm/xdebug.ini | 6 ++++++ 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .DS_Store create mode 100644 php-fpm/xdebug.ini diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1f2c53597751e583d4ae5c6983f190a25f1a032d GIT binary patch literal 8196 zcmeI1OKjX!6hQAy(&oLSNt}>2Zj)&TCV{j}ARqFfAu##3;?vT}uSp^CjGe~9W2a+J zrfoAm}W@4L3| z^%*~14*=jmPHzKH0f12#QYoilize)%Z)!z>ri3JtKfpXJLMD}W7gN@z)uAHHK$w9r z17QZj41^i@KV*RRY|+>@`@Xb>W0-+313NMU;{6b%E@UE*t5W)}4jTLtfTSn^{6=%C z1AL!oAQORHmC|>mbIR%g16K@643zF(7!sA?V`PftR@TBX#yp1V3AGfrWVM*0} zyo)Ih^T{O{mQ>d8ql{0bolJ&q+LgLK^&zHw$(|G!enfM<6N`pT*A^l4H>m1qq3_pq zLuZV|63z0-#uBY^qKKViKg8id7=dX>gAI9j0WQOfa0T9mtMCzAgU{g$_!_=}Z{Y^~ z2tUEk@C*C~zr!E!CjxRT!*Z;{DBg}SY{bLZjvd&EUD%65IEc|Y zjsFRXH}(krs%vhm-FqXlN#Hd_;`4@DypMGzwo8=E3rK_Z&_*27I?EedQc_mHia;FY%a4jxf<5vS6# zyN7e7gg} Date: Tue, 27 Mar 2018 11:32:33 +0200 Subject: [PATCH 2/6] Removed .DS_Store --- .DS_Store | Bin 8196 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 1f2c53597751e583d4ae5c6983f190a25f1a032d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeI1OKjX!6hQAy(&oLSNt}>2Zj)&TCV{j}ARqFfAu##3;?vT}uSp^CjGe~9W2a+J zrfoAm}W@4L3| z^%*~14*=jmPHzKH0f12#QYoilize)%Z)!z>ri3JtKfpXJLMD}W7gN@z)uAHHK$w9r z17QZj41^i@KV*RRY|+>@`@Xb>W0-+313NMU;{6b%E@UE*t5W)}4jTLtfTSn^{6=%C z1AL!oAQORHmC|>mbIR%g16K@643zF(7!sA?V`PftR@TBX#yp1V3AGfrWVM*0} zyo)Ih^T{O{mQ>d8ql{0bolJ&q+LgLK^&zHw$(|G!enfM<6N`pT*A^l4H>m1qq3_pq zLuZV|63z0-#uBY^qKKViKg8id7=dX>gAI9j0WQOfa0T9mtMCzAgU{g$_!_=}Z{Y^~ z2tUEk@C*C~zr!E!CjxRT!*Z;{DBg}SY{bLZjvd&EUD%65IEc|Y zjsFRXH}(krs%vhm-FqXlN#Hd_;`4@DypMGzwo8=E3rK_Z&_*27I?EedQc_mHia;FY%a4jxf<5vS6# zyN7e7gg} Date: Tue, 27 Mar 2018 11:37:56 +0200 Subject: [PATCH 3/6] Added xdebug to readme --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 16644ba..24208b6 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,11 @@ You can access Nginx and Symfony application logs in the following directories o You can also use Kibana to visualize Nginx & Symfony logs by visiting `http://symfony.localhost:81`. +# Use xdebug! + +To use xdebug change the line `"docker.host:127.0.0.1"` in docker-compose.yml and replace 127.0.0.1 with your machines ip addres. +If your IDEs default port is not set to 5902 you should do that, too. + # Code license You are free to use the code in this repository under the terms of the 0-clause BSD license. LICENSE contains a copy of this license. From 61373f94d686d662cec975f8c58e3577ea64cea8 Mon Sep 17 00:00:00 2001 From: Pascal Krason Date: Tue, 27 Mar 2018 11:39:20 +0200 Subject: [PATCH 4/6] Re-Added simplexml, how did i kill this? --- php-fpm/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 6d39274..1fa8654 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -25,6 +25,7 @@ RUN apk add --update \ php7-phar \ php7-tokenizer \ php7-session \ + Php7-simplexml \ php7-xdebug \ make \ curl From 0bb5c2678bf889a648c03c4f3041d4bf61b48005 Mon Sep 17 00:00:00 2001 From: Pascal Krason Date: Tue, 27 Mar 2018 11:44:39 +0200 Subject: [PATCH 5/6] Changed casing, should fix failing tests --- php-fpm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 1fa8654..8eb1297 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -25,7 +25,7 @@ RUN apk add --update \ php7-phar \ php7-tokenizer \ php7-session \ - Php7-simplexml \ + php7-simplexml \ php7-xdebug \ make \ curl From 9aafb876c45c1d74f901d0e0220df61e1a655f3f Mon Sep 17 00:00:00 2001 From: Pascal Krason Date: Thu, 5 Jul 2018 10:58:06 +0200 Subject: [PATCH 6/6] Fixed typos in the readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 24208b6..0aaeb1b 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,8 @@ You can also use Kibana to visualize Nginx & Symfony logs by visiting `http://sy # Use xdebug! -To use xdebug change the line `"docker.host:127.0.0.1"` in docker-compose.yml and replace 127.0.0.1 with your machines ip addres. -If your IDEs default port is not set to 5902 you should do that, too. +To use xdebug change the line `"docker.host:127.0.0.1"` in docker-compose.yml and replace 127.0.0.1 with your machine ip addres. +If your IDE default port is not set to 5902 you should do that, too. # Code license