Merge pull request #384 from LarryEitel/phpstorm-guide

phpstorm-debugging-guide

README-zh.md

@@ -7,9 +7,7 @@
 LaraDock能够帮你在**Docker**上快速搭建**Laravel**应用。
 <br>
 就像Laravel Homestead一样，但是Docker替换了Vagrant。
->先在Docker上使用LaraDock，然后再学习它们。
-
-![](https://s31.postimg.org/nbettdki3/lara_dock_poster_new.jpg)
+> 先在使用 LaraDock，然后再学习它们。
 
 <br>
 ## 目录

README.md

@@ -61,6 +61,7 @@ Laradock is configured to run Laravel Apps by default, and it can be modifyed to
 		- [Access workspace via ssh](#Workspace-ssh)
 		- [MySQL access from host](#MySQL-access-from-host)
 		- [MySQL root access](#MySQL-root-access)
+		- [Change MySQL port](#Change-MySQL-port)
 		- [Use custom Domain](#Use-custom-Domain)
 		- [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install)
 		- [Install Prestissimo](#Install-Prestissimo)
@@ -287,7 +288,13 @@ git clone https://github.com/LaraDock/laradock.git
 ```
 Do the same for each project `project2.conf`, `project3.conf`,...
 
-6 - Create your project Databases **To Be Continue..**
+6 - Add the domains to the **hosts** files.
+
+```
+127.0.0.1  project1.dev
+```
+
+7 - Create your project Databases. Right now you have to do it manually by entering your DB container, until we automate it soon.
 
 
 
@@ -1158,6 +1165,17 @@ The default username and password for the root mysql user are `root` and `root `
 4 - Run any commands `show databases`, `show tables`, `select * from.....`.
 
 
+<a name="Change-MySQL-port"></a>
+### Change MySQL port
+
+Modify the `mysql/my.cnf` file to set your port number, `1234` is used as an example.
+
+```
+[mysqld] 
+port=1234
+```
+
+If you need <a href="#MySQL-access-from-host">MySQL access from your host</a>, do not forget to change the internal port number (`"3306:3306"` -> `"3306:1234"`) in the docker-compose config file.
 
 <a name="Use-custom-Domain"></a>
 ### Use custom Domain (instead of the Docker IP)
@@ -1313,7 +1331,18 @@ It should be like this:
 
 <br>
 <a name="debugging"></a>
-### Debugging
+
+### PHPStorm
+Remote debug Laravel web and phpunit tests.
+
+####[Full Guide Here](https://github.com/LaraDock/laradock/blob/master/_guides/phpstorm.md)
+
+
+<br>
+<a name="Misc"></a>
+
+### Miscellaneous
+
 
 *Here's a list of the common problems you might face, and the possible solutions.*
 
@@ -1334,9 +1363,9 @@ Use `http://127.0.0.1` instead of `http://localhost` in your browser.
 
 
 
-#### I see an error message containing `address already in use`
+#### I see an error message containing `address already in use` or `port is already allocated`
 
-Make sure the ports for the services that you are trying to run (80, 3306, etc.) are not being used already by other programs, such as a built in `apache`/`httpd` service or other development tools you have installed.
+Make sure the ports for the services that you are trying to run (22, 80, 443, 3306, etc.) are not being used already by other programs on the host, such as a built in `apache`/`httpd` service or other development tools you have installed.
 
 
 
@@ -1351,8 +1380,11 @@ Make sure the ports for the services that you are trying to run (80, 3306, etc.)
 
 This error is sometimes happens because your Laravel application isn't running on the container localhost IP (Which is 127.0.0.1). Steps to fix it:
 
+* Option A
   1. Check your running Laravel application IP by dumping `Request::ip()` variable using `dd(Request::ip())` anywhere on your application. The result is the IP of your Laravel container.
   2. Change the `DB_HOST` variable on env with the IP that you received from previous step.
+* Option B
+   1. Change the `DB_HOST` value to the same name as the mysql docker container. The Laradock docker-compose file currently has this as `mysql`
 
 
 

_guides/phpstorm.md

@@ -0,0 +1,302 @@
+# PHPStorm Debugging Guide
+
+- [Intro](#Intro)
+- [Installation](#Installation)
+    - [Customize laradock/docker-compose.yml](#CustomizeDockerCompose) 
+        - [Clean House](#InstallCleanHouse) 
+        - [LaraDock Dial Tone](#InstallLaraDockDialTone) 
+        - [hosts](#AddToHosts) 
+        - [Firewall](#FireWall) 
+        - [Enable xDebug on php-fpm](#enablePhpXdebug)
+    - [PHPStorm Settings](#InstallPHPStorm)
+        - [Configs](#InstallPHPStormConfigs)
+- [Usage](#Usage)
+    - [Laravel](#UsageLaravel) 
+        - [Run ExampleTest](#UsagePHPStormRunExampleTest) 
+        - [Debug ExampleTest](#UsagePHPStormDebugExampleTest) 
+        - [Debug Web Site](#UsagePHPStormDebugSite) 
+- [SSH into workspace](#SSHintoWorkspace) 
+    - [KiTTY](#InstallKiTTY) 
+    
+<a name="Intro"></a>
+## Intro
+
+Wiring up [Laravel](https://laravel.com/), [LaraDock](https://github.com/LaraDock/laradock) [Laravel+Docker] and [PHPStorm](https://www.jetbrains.com/phpstorm/) to play nice together complete with remote xdebug'ing as icing on top! Although this guide is based on `PHPStorm Windows`, 
+you should be able to adjust accordingly. This guide was written based on Docker for Windows Native.
+
+<a name="Installation"></a>
+## Installation
+
+- This guide assumes the following:
+    - you have already installed and are familiar with Laravel, LaraDock and PHPStorm. 
+    - you have installed Laravel as a parent of `laradock`. This guide assumes `/c/_dk/laravel`. 
+
+<a name="AddToHosts"></a>
+## hosts
+- Add `laravel` to your hosts file located on Windows 10 at `C:\Windows\System32\drivers\etc\hosts`. It should be set to the IP of your running container. Mine is: `10.0.75.2`
+On Windows you can find it by opening Windows `Hyper-V Manager`.
+    - ![Windows Hyper-V Manager](photos/PHPStorm/Settings/WindowsHyperVManager.png)
+        
+- [Hosts File Editor](https://github.com/scottlerch/HostsFileEditor) makes it easy to change your hosts file.
+    - Set `laravel` to your docker host IP. See [Example](photos/SimpleHostsEditor/AddHost_laravel.png).
+
+
+<a name="FireWall"></a>
+## Firewall
+Your PHPStorm will need to be able to receive a connection from PHP xdebug either your running workspace or php-fpm containers on port 9000. This means that your Windows Firewall should either enable connections from the Application PHPStorm OR the port. 
+
+- It is important to note that if the Application PHPStorm is NOT enabled in the firewall, you will not be able to recreate a rule to override that.
+- Also be aware that if you are installing/upgrade different versions of PHPStorm, you MAY have orphaned references to PHPStorm in your Firewall! You may decide to remove orphaned references however in either case, make sure that they are set to receive public TCP traffic.
+
+### Edit laradock/docker-compose.yml
+Set the following variables:
+```
+### Workspace Utilities Container ###########################
+
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_XDEBUG=true
+                - INSTALL_WORKSPACE_SSH=true
+                ...
+                
+                
+### PHP-FPM Container #######################################
+
+    php-fpm:
+        build:
+            context: ./php-fpm
+            args:
+                - INSTALL_XDEBUG=true
+                ...
+                
+```
+
+### Edit xdebug.ini files
+- `laradock/workspace/xdebug.ini`
+- `laradock/php-fpm/xdebug.ini`
+
+Set the following variables:
+```
+xdebug.remote_autostart=1
+xdebug.remote_enable=1
+xdebug.remote_connect_back=1
+xdebug.cli_color=1
+```
+
+
+<a name="InstallCleanHouse"></a>
+### Need to clean house first?
+Make sure you are starting with a clean state. For example, do you have other LaraDock containers and images?
+Here are a few things I use to clean things up.
+
+- Delete all containers using `grep laradock_` on the names, see: [Remove all containers based on docker image name](https://linuxconfig.org/remove-all-containners-based-on-docker-image-name). 
+`docker ps -a | awk '{ print $1,$2 }' | grep laradock_ | awk '{print $1}' | xargs -I {} docker rm {}`
+
+- Delete all images containing `laradock`.
+`docker images | awk '{print $1,$2,$3}' | grep laradock_ | awk '{print $3}' | xargs -I {} docker rmi {}`
+**Note:** This will only delete images that were built with `LaraDock`, **NOT** `laradock/*` which are pulled down by `LaraDock` such as `laradock/workspace`, etc.
+**Note:** Some may fail with: 
+`Error response from daemon: conflict: unable to delete 3f38eaed93df (cannot be forced) - image has dependent child images`
+
+- I added this to my `.bashrc` to remove orphaned images.
+    ```
+    dclean() {
+        processes=`docker ps -q -f status=exited`
+        if [ -n "$processes" ]; thend
+          docker rm $processes
+        fi
+    
+        images=`docker images -q -f dangling=true`
+        if [ -n "$images" ]; then
+          docker rmi $images
+        fi
+    }
+    ```
+
+- If you frequently switch configurations for LaraDock, you may find that adding the following and added to your `.bashrc` or equivalent useful:
+```
+# remove laravel* containers
+# remove laravel_* images
+dcleanlaradockfunction()
+{
+	echo 'Removing ALL containers associated with laradock'
+	docker ps -a | awk '{ print $1,$2 }' | grep laradock | awk '{print $1}' | xargs -I {} docker rm {}
+
+	# remove ALL images associated with laradock_
+	# does NOT delete laradock/* which are hub images
+	echo 'Removing ALL images associated with laradock_'
+	docker images | awk '{print $1,$2,$3}' | grep laradock_ | awk '{print $3}' | xargs -I {} docker rmi {}
+
+	echo 'Listing all laradock docker hub images...'
+	docker images | grep laradock
+
+	echo 'dcleanlaradock completed'
+}
+# associate the above function with an alias
+# so can recall/lookup by typing 'alias'
+alias dcleanlaradock=dcleanlaradockfunction
+```
+
+<a name="InstallLaraDockDialTone"></a>
+#### Let's get a dial-tone with Laravel
+
+```
+# barebones at this point
+docker-compose up -d nginx mysql
+
+# run 
+docker-compose ps
+
+# Should see:
+          Name                        Command             State                     Ports
+-----------------------------------------------------------------------------------------------------------
+laradock_mysql_1            docker-entrypoint.sh mysqld   Up       0.0.0.0:3306->3306/tcp
+laradock_nginx_1            nginx                         Up       0.0.0.0:443->443/tcp, 0.0.0.0:80->80/tcp
+laradock_php-fpm_1          php-fpm                       Up       9000/tcp
+laradock_volumes_data_1     true                          Exit 0
+laradock_volumes_source_1   true                          Exit 0
+laradock_workspace_1        /sbin/my_init                 Up       0.0.0.0:2222->22/tcp
+
+
+```
+
+<a name="enablePhpXdebug"></a>
+#### Enable xDebug on php-fpm
+In a host terminal sitting in the laradock folder, run: `./xdebugPhpFpm status`
+You should see something like the following:
+```
+xDebug status
+laradock_php-fpm_1
+PHP 7.0.9 (cli) (built: Aug 10 2016 19:45:48) ( NTS )
+Copyright (c) 1997-2016 The PHP Group
+Zend Engine v3.0.0, Copyright (c) 1998-2016 Zend Technologies
+    with Xdebug v2.4.1, Copyright (c) 2002-2016, by Derick Rethans
+```
+Other commands include `./xdebugPhpFpm start | stop`.
+
+If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will already be running when
+`php-fpm` is started and listening for debug info on port 9000.
+
+
+<a name="InstallPHPStormConfigs"></a>
+#### PHPStorm Settings
+- Here are some settings that are known to work:
+    - `Settings/BuildDeploymentConnection`
+        - ![Settings/BuildDeploymentConnection](photos/PHPStorm/Settings/BuildDeploymentConnection.png)
+    
+    - `Settings/BuildDeploymentConnectionMappings`
+        - ![Settings/BuildDeploymentConnectionMappings](photos/PHPStorm/Settings/BuildDeploymentConnectionMappings.png)
+    
+    - `Settings/BuildDeploymentDebugger`
+        - ![Settings/BuildDeploymentDebugger](photos/PHPStorm/Settings/BuildDeploymentDebugger.png)
+    
+    - `Settings/EditRunConfigurationRemoteWebDebug`
+        - ![Settings/EditRunConfigurationRemoteWebDebug](photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png)
+    
+    - `Settings/EditRunConfigurationRemoteExampleTestDebug`
+        - ![Settings/EditRunConfigurationRemoteExampleTestDebug](photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png)
+    
+    - `Settings/LangsPHPDebug`
+        - ![Settings/LangsPHPDebug](photos/PHPStorm/Settings/LangsPHPDebug.png)
+    
+    - `Settings/LangsPHPInterpreters`
+        - ![Settings/LangsPHPInterpreters](photos/PHPStorm/Settings/LangsPHPInterpreters.png)
+    
+    - `Settings/LangsPHPPHPUnit`
+        - ![Settings/LangsPHPPHPUnit](photos/PHPStorm/Settings/LangsPHPPHPUnit.png)
+    
+    - `Settings/LangsPHPServers`
+        - ![Settings/LangsPHPServers](photos/PHPStorm/Settings/LangsPHPServers.png)
+    
+    - `RemoteHost`
+        To switch on this view, go to: `Menu/Tools/Deployment/Browse Remote Host`.
+        - ![RemoteHost](photos/PHPStorm/RemoteHost.png)
+        
+    - `RemoteWebDebug`
+        - ![DebugRemoteOn](photos/PHPStorm/DebugRemoteOn.png)
+
+    - `EditRunConfigurationRemoteWebDebug`
+        Go to: `Menu/Run/Edit Configurations`.
+        - ![EditRunConfigurationRemoteWebDebug](photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png)
+
+    - `EditRunConfigurationRemoteExampleTestDebug`
+        Go to: `Menu/Run/Edit Configurations`.
+        - ![EditRunConfigurationRemoteExampleTestDebug](photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png)
+
+    - `WindowsFirewallAllowedApps`
+        Go to: `Control Panel\All Control Panel Items\Windows Firewall\Allowed apps`.
+        - ![WindowsFirewallAllowedApps.png](photos/PHPStorm/Settings/WindowsFirewallAllowedApps.png)
+
+    - `hosts`
+        Edit: `C:\Windows\System32\drivers\etc\hosts`.
+        - ![WindowsFirewallAllowedApps.png](photos/PHPStorm/Settings/hosts.png)
+
+        - [Enable xDebug on php-fpm](#enablePhpXdebug)
+
+
+
+<a name="Usage"></a>
+## Usage
+
+<a name="UsagePHPStormRunExampleTest"></a>
+### Run ExampleTest
+- right-click on `tests/ExampleTest.php`
+    - Select: `Run 'ExampleTest.php'` or `Ctrl+Shift+F10`.
+    - Should pass!! You just ran a remote test via SSH!
+
+<a name="UsagePHPStormDebugExampleTest"></a>
+### Debug ExampleTest
+- Open to edit: `tests/ExampleTest.php`
+- Add a BreakPoint on line 16: `$this->visit('/')`
+- right-click on `tests/ExampleTest.php`
+    - Select: `Debug 'ExampleTest.php'`.
+    - Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
+    - ![Remote Test Debugging Success](photos/PHPStorm/RemoteTestDebuggingSuccess.png)
+
+
+<a name="UsagePHPStormDebugSite"></a>
+### Debug WebSite
+- In case xDebug is disabled, from the `laradock` folder run: 
+`./xdebugPhpFpm start`.
+    - To switch xdebug off, run: 
+`./xdebugPhpFpm stop`
+    
+- Start Remote Debugging
+    - ![DebugRemoteOn](photos/PHPStorm/DebugRemoteOn.png)
+    
+- Open to edit: `bootstrap/app.php`
+- Add a BreakPoint on line 14: `$app = new Illuminate\Foundation\Application(`
+- Reload [Laravel Site](http://laravel/)
+    - Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
+    - ![Remote Debugging Success](photos/PHPStorm/RemoteDebuggingSuccess.png)
+
+
+<a name="SSHintoWorkspace"></a>
+#### Let's shell into workspace
+Assuming that you are in laradock folder, type:
+`ssh -i workspace/insecure_id_rsa -p2222 root@laravel`
+**Cha Ching!!!!**
+- `workspace/insecure_id_rsa.ppk` may become corrupted. In which case:
+    - fire up `puttygen`
+    - import `workspace/insecure_id_rsa`
+    - save private key to `workspace/insecure_id_rsa.ppk`
+
+<a name="InstallKiTTY"></a>
+
+##### KiTTY
+[Kitty](http://www.9bis.net/kitty/) KiTTY is a fork from version 0.67 of PuTTY.
+
+- Here are some settings that are working for me:
+    - ![Session](photos/KiTTY/Session.png)
+    - ![Terminal](photos/KiTTY/Terminal.png)
+    - ![Window](photos/KiTTY/Window.png)
+    - ![WindowAppearance](photos/KiTTY/WindowAppearance.png)
+    - ![Connection](photos/KiTTY/Connection.png)
+    - ![ConnectionData](photos/KiTTY/ConnectionData.png)
+    - ![ConnectionSSH](photos/KiTTY/ConnectionSSH.png)
+    - ![ConnectionSSHAuth](photos/KiTTY/ConnectionSSHAuth.png)
+    - ![TerminalShell](photos/KiTTY/TerminalShell.png)
+
+

docker-compose.yml

@@ -112,23 +112,24 @@ services:
 ### MySQL Container #########################################
 
     mysql:
-        build: ./mysql
+        build: 
+            context: ./mysql
+            args:
+                - MYSQL_DATABASE=homestead
+                - MYSQL_USER=homestead
+                - MYSQL_PASSWORD=secret
+                - MYSQL_ROOT_PASSWORD=root
         volumes:
             - mysql:/var/lib/mysql
         ports:
             - "3306:3306"
-        environment:
-            MYSQL_DATABASE: homestead
-            MYSQL_USER: homestead
-            MYSQL_PASSWORD: secret
-            MYSQL_ROOT_PASSWORD: root
 
 ### MariaDB Container #######################################
 
     mariadb:
         build: ./mariadb
         volumes:
-            - mariadb
+            - mysql:/var/lib/mysql
         ports:
             - "3306:3306"
         environment:
@@ -150,6 +151,19 @@ services:
             POSTGRES_USER: homestead
             POSTGRES_PASSWORD: secret
 
+### PostgreSQL PostGis Container ############################
+
+    postgres-postgis:
+        build: ./postgres-postgis
+        volumes:
+            - postgres:/var/lib/postgresql/data
+        ports:
+            - "5432:5432"
+        environment:
+            POSTGRES_DB: homestead
+            POSTGRES_USER: homestead
+            POSTGRES_PASSWORD: secret
+
 ### Neo4j Container #########################################
 
     neo4j:
@@ -267,8 +281,6 @@ services:
             MYSQL_USER: homestead
             MYSQL_PASSWORD: secret
             MYSQL_ROOT_PASSWORD: root
-        volumes:
-            - phpmyadmin
         ports:
             - "8080:80"
         links:

mysql/Dockerfile

@@ -2,8 +2,26 @@ FROM mysql:5.6
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+ADD startup /etc/mysql/startup
+
+RUN chown -R mysql:root /var/lib/mysql/
+
+ARG MYSQL_DATABASE=homestead
+ARG MYSQL_USER=homestead
+ARG MYSQL_PASSWORD=secret
+ARG MYSQL_ROOT_PASSWORD=root
+
+ENV MYSQL_DATABASE=$MYSQL_DATABASE
+ENV MYSQL_USER=$MYSQL_USER
+ENV MYSQL_PASSWORD=$MYSQL_PASSWORD
+ENV MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
+
+RUN sed -i 's/MYSQL_DATABASE/'$MYSQL_DATABASE'/g' /etc/mysql/startup && \
+    sed -i 's/MYSQL_USER/'$MYSQL_USER'/g' /etc/mysql/startup && \
+    sed -i 's/MYSQL_PASSWORD/'$MYSQL_PASSWORD'/g' /etc/mysql/startup
+
 ADD my.cnf /etc/mysql/conf.d/my.cnf
 
-CMD ["mysqld"]
+CMD ["mysqld", "--init-file=/etc/mysql/startup"]
 
 EXPOSE 3306

mysql/startup

@@ -0,0 +1,3 @@
+DROP USER 'homestead';
+CREATE DATABASE IF NOT EXISTS MYSQL_DATABASE;
+GRANT ALL ON `MYSQL_DATABASE`.* TO 'MYSQL_USER'@'%' IDENTIFIED BY 'MYSQL_PASSWORD';

postgres-postgis/Dockerfile

@@ -0,0 +1,5 @@
+FROM mdillon/postgis:latest
+
+CMD ["postgres"]
+
+EXPOSE 5432

workspace/Dockerfile

@@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/workspace/tags/
 #
 
-FROM laradock/workspace:1.1
+FROM laradock/workspace:1.2
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -191,6 +191,7 @@ ARG INSTALL_YARN=false
 ENV INSTALL_YARN ${INSTALL_YARN}
 
 RUN if [ ${INSTALL_YARN} = true ]; then \
+    [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && \
     curl -o- -L https://yarnpkg.com/install.sh | bash && \
     echo "" >> ~/.bashrc && \
     echo 'export PATH="$HOME/.yarn/bin:$PATH"' >> ~/.bashrc \