Merge pull request #91 from LaraDock/xdebug

Xdebug

README.md

@@ -48,6 +48,7 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 		- [Run a Docker Virtual Host](#Run-Docker-Virtual-Host)
 		- [Find your Docker IP Address](#Find-Docker-IP-Address)
 		- [Use custom Domain](#Use-custom-Domain)
+		- [Debugging](#debugging)
 - [Help & Questions](#Help)
 
 
@@ -242,15 +243,11 @@ DB_HOST=xxx.xxx.xxx.xxx
 5 - Open your browser and visit your `{Docker-IP}` address (`http://xxx.xxx.xxx.xxx`).
 
 
-<br>
-**Debugging**: in case you faced an error here, run this command from the Laravel root directory:
-
-```bash
-sudo chmod -R 777 storage bootstrap/cache
-```
 
 <br>
-If you have any problem, or need a special support. Feel free to contact me, more details in the [Help & Questions](#Help) secion.
+**Debugging**: if you are facing any problem here check the [Debugging](#debugging) section.
+
+If you need a special support. Contact me, more details in the [Help & Questions](#Help) section.
 
 
 <br>
@@ -716,6 +713,8 @@ eval $(docker-machine env)
 
 **On Windows & MAC:** 
 
+Run this command in your terminal:
+
 ```bash
 docker-machine ip default
 ```
@@ -723,30 +722,20 @@ If your Host name is different then `default`, you have to specify it (`docker-m
 
 *(The default IP is 192.168.99.100)*
 
+<br>
+
 > **boot2docker** users: run `boot2docker ip` *(when boot2docker is up)*.
 
 <br>
 **On Linux:** 
 
-1 - Run `ifconfig` in the terminal.
+Run this command in your terminal:
-
-2 - In the result search for `docker0`, your IP address will be next to `inet addr`.
-
-Example: (In this example your IP address is `172.17.0.1`).
 
 ```shell
-docker0   Link encap:Ethernet  HWaddr 02:42:41:2d:c4:24
+ifconfig docker0 | grep 'inet' | cut -d: -f2 | awk '{ print $1}' | head -n1
-          inet addr:172.17.0.1  Bcast:0.0.0.0  Mask:255.255.0.0
-          UP BROADCAST MULTICAST  MTU:1500  Metric:1
-          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
-          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
-          collisions:0 txqueuelen:0
-          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
 ```
->If you have an easier way to do it, share it with us.
-
-
 
+*(The default IP is 172.17.0.1)*
 
 
 
@@ -781,6 +770,24 @@ server_name laravel.dev;
 ```
 
 
+<br>
+<a name="debugging"></a>
+### Debugging
+
+*Here's a list of the common problems you might face, and the possible solutions.*
+
+#### + I see a blank (white) page instead of the Laravel 'Welcome' page!
+
+run this command from the Laravel root directory:
+
+```bash
+sudo chmod -R 777 storage bootstrap/cache
+```
+
+#### + I see "Welcome to nginx" instead of the Laravel App!
+
+use `http://127.0.0.1` instead of `http://localhost` in your browser.
+
 
 
 
@@ -794,30 +801,21 @@ server_name laravel.dev;
 
 This little project was built by one man who has a full time job and many responsibilities, so if you like this project and you find that it needs a bug fix or support for new software or upgrade any container, or anything else.. Do not hesitate to contribute, you are more than welcome :)
 
-## Support
-
-To suggest a features or report a bug, open a new [Issue](https://github.com/laradock/laradock/issues).
-
-
 
 <a name="Help"></a>
 ## Help & Questions
 
-If you need help with anything related to this project, shedule a live call with me on [Codementor](https://www.codementor.io/mahmoudz), I'd love to help.
+If you need any help with Docker and Laravel, you can schedule a live call with the creator of this project at [Codementor.io](https://www.codementor.io/mahmoudz), He would love to help.
 
-If you have a short question, send me a direct message on LaraChat, my username is `mahmoud_zalt`. Or send me an email on `mahmoud@zalt.me`.
+For general questions you can open [Issues](https://github.com/laradock/laradock/issues) here on Github (We will label them as questions).
+
+Additionally, you can contact Mahmoud Zalt (the creator of this project) via a direct message on LaraChat, (his username is `mahmoud_zalt`). Or send him an email (`mahmoud@zalt.me`).
 
 
 ## Credits
 
-[![Mahmoud Zalt](https://img.shields.io/badge/Author-Mahmoud%20Zalt-orange.svg)](http://www.zalt.me)
+- [Mahmoud Zalt](https://github.com/Mahmoudz) (Twitter [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt))
-
+- [Awesome list of contributors](https://github.com/LaraDock/laradock/graphs/contributors)
-Twitter: [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt)
-<br>
-Website: [http://zalt.me](http://zalt.me)
-<br>
-Email: `mahmoud@zalt.me`
-
 
 ## License
 

docker-compose.yml

@@ -27,12 +27,12 @@ services:
     data:
         build: ./data
         volumes:
-            - /var/lib/mysql
+            - /var/lib/mysql:/var/lib/mysql
-            - /var/lib/postgres
+            - /var/lib/postgres:/var/lib/postgres
-            - /var/lib/mariadb
+            - /var/lib/mariadb:/var/lib/mariadb
-            - /var/lib/redis
+            - /var/lib/memcached:/var/lib/memcached
-            - /var/lib/memcached
+            - /var/lib/neo4j:/var/lib/neo4j/data
-            - /var/lib/neo4j/data
+            - /var/lib/redis:/data
 
 ### Nginx Server Container ##################################
 

php-fpm/Dockerfile-55

@@ -8,17 +8,23 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 RUN apt-get update && apt-get install -y \
     libpq-dev \
     libmemcached-dev \
-    curl
+    curl \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*
 
 # Install extensions using the helper script provided by the base image
 RUN docker-php-ext-install \
     pdo_mysql \
     pdo_pgsql
 
-#Install memcached
+# Install memcached
 RUN pecl install memcached \
     && docker-php-ext-enable memcached
 
+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
 RUN usermod -u 1000 www-data
 
 WORKDIR /var/www/laravel

php-fpm/Dockerfile-56

@@ -8,17 +8,23 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 RUN apt-get update && apt-get install -y \
     libpq-dev \
     libmemcached-dev \
-    curl
+    curl \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*
 
 # Install extensions using the helper script provided by the base image
 RUN docker-php-ext-install \
     pdo_mysql \
     pdo_pgsql
 
-#Install memcached
+# Install memcached
 RUN pecl install memcached \
     && docker-php-ext-enable memcached
 
+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
 RUN usermod -u 1000 www-data
 
 WORKDIR /var/www/laravel

php-fpm/Dockerfile-70

@@ -8,7 +8,9 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 RUN apt-get update && apt-get install -y \
     libpq-dev \
     libmemcached-dev \
-    curl
+    curl \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*
 
 # Install extensions using the helper script provided by the base image
 RUN docker-php-ext-install \
@@ -23,6 +25,10 @@ RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-m
     && docker-php-ext-install memcached \
     && rm /tmp/memcached.tar.gz
 
+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
 RUN usermod -u 1000 www-data
 
 WORKDIR /var/www/laravel

php-fpm/laravel.ini

@@ -1,3 +1,3 @@
-date.timezone = UTC
+date.timezone=UTC
-display_errors = Off
+display_errors=Off
-log_errors = On
+log_errors=On

redis/Dockerfile

@@ -4,8 +4,8 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
 #COPY redis.conf /usr/local/etc/redis/redis.conf
 
-VOLUME /var/lib/redis
+VOLUME /data
-
-CMD [ "redis-server" ]
 
 EXPOSE 6379
+
+CMD ["redis-server"]

workspace/Dockerfile

@@ -20,7 +20,7 @@ RUN add-apt-repository -y \
     ppa:ondrej/php
 
 # Install PHP-CLI 7, some PHP extentions and some useful Tools with APT
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --force-yes \
         php7.0-cli \
         php7.0-common \
         php7.0-curl \
@@ -33,6 +33,7 @@ RUN apt-get update && apt-get install -y \
         php7.0-sqlite \
         php7.0-sqlite3 \
         php7.0-zip \
+        php7.0-memcached \
         sqlite3 \
         libsqlite3-dev \
         git \
@@ -51,6 +52,9 @@ RUN npm install -g \
     gulp \
     bower
 
+# Link the global gulp to be used locally
+RUN npm link gulp
+
 # Add a symbolic link for Node
 RUN ln -s /usr/bin/nodejs /usr/bin/node