Merge branch 'master' of https://github.com/dtunes/laradock into dtunes-master
* 'master' of https://github.com/dtunes/laradock: Upgrade hugo to 0.20.2 and added uglyurls = true to fix issues we when upgrading from 0.19 to 0.20 recently, also fixed 404 photos*
This commit is contained in:
Mahmoud Zalt
commit
481ac821de
@ -8,7 +8,7 @@ env:
|
|||||||
- PHP_VERSION=56
|
- PHP_VERSION=56
|
||||||
- PHP_VERSION=70
|
- PHP_VERSION=70
|
||||||
- PHP_VERSION=71
|
- PHP_VERSION=71
|
||||||
- HUGO_VERSION=0.19
|
- HUGO_VERSION=0.20.2
|
||||||
|
|
||||||
script: ./travis-build.sh
|
script: ./travis-build.sh
|
||||||
|
|
||||||
|
|||||||
@ -5,6 +5,7 @@ title = "Laradock"
|
|||||||
theme = "hugo-material-docs"
|
theme = "hugo-material-docs"
|
||||||
metadataformat = "yaml"
|
metadataformat = "yaml"
|
||||||
canonifyurls = true
|
canonifyurls = true
|
||||||
|
uglyurls = true
|
||||||
# Enable Google Analytics by entering your tracking id
|
# Enable Google Analytics by entering your tracking id
|
||||||
googleAnalytics = "UA-37514928-9"
|
googleAnalytics = "UA-37514928-9"
|
||||||
|
|
||||||
|
|||||||
@ -279,10 +279,10 @@ you should be able to adjust accordingly. This guide was written based on Docker
|
|||||||
## hosts
|
## 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`
|
- 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`.
|
On Windows you can find it by opening Windows `Hyper-V Manager`.
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- [Hosts File Editor](https://github.com/scottlerch/HostsFileEditor) makes it easy to change your hosts file.
|
- [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).
|
- Set `laravel` to your docker host IP. See [Example](images/photos/SimpleHostsEditor/AddHost_laravel.png).
|
||||||
|
|
||||||
|
|
||||||
<a name="FireWall"></a>
|
<a name="FireWall"></a>
|
||||||
@ -428,54 +428,54 @@ If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will
|
|||||||
## PHPStorm Settings
|
## PHPStorm Settings
|
||||||
- Here are some settings that are known to work:
|
- Here are some settings that are known to work:
|
||||||
- `Settings/BuildDeploymentConnection`
|
- `Settings/BuildDeploymentConnection`
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `Settings/BuildDeploymentConnectionMappings`
|
- `Settings/BuildDeploymentConnectionMappings`
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `Settings/BuildDeploymentDebugger`
|
- `Settings/BuildDeploymentDebugger`
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `Settings/EditRunConfigurationRemoteWebDebug`
|
- `Settings/EditRunConfigurationRemoteWebDebug`
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `Settings/EditRunConfigurationRemoteExampleTestDebug`
|
- `Settings/EditRunConfigurationRemoteExampleTestDebug`
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `Settings/LangsPHPDebug`
|
- `Settings/LangsPHPDebug`
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `Settings/LangsPHPInterpreters`
|
- `Settings/LangsPHPInterpreters`
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `Settings/LangsPHPPHPUnit`
|
- `Settings/LangsPHPPHPUnit`
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `Settings/LangsPHPServers`
|
- `Settings/LangsPHPServers`
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `RemoteHost`
|
- `RemoteHost`
|
||||||
To switch on this view, go to: `Menu/Tools/Deployment/Browse Remote Host`.
|
To switch on this view, go to: `Menu/Tools/Deployment/Browse Remote Host`.
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `RemoteWebDebug`
|
- `RemoteWebDebug`
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `EditRunConfigurationRemoteWebDebug`
|
- `EditRunConfigurationRemoteWebDebug`
|
||||||
Go to: `Menu/Run/Edit Configurations`.
|
Go to: `Menu/Run/Edit Configurations`.
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `EditRunConfigurationRemoteExampleTestDebug`
|
- `EditRunConfigurationRemoteExampleTestDebug`
|
||||||
Go to: `Menu/Run/Edit Configurations`.
|
Go to: `Menu/Run/Edit Configurations`.
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `WindowsFirewallAllowedApps`
|
- `WindowsFirewallAllowedApps`
|
||||||
Go to: `Control Panel\All Control Panel Items\Windows Firewall\Allowed apps`.
|
Go to: `Control Panel\All Control Panel Items\Windows Firewall\Allowed apps`.
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- `hosts`
|
- `hosts`
|
||||||
Edit: `C:\Windows\System32\drivers\etc\hosts`.
|
Edit: `C:\Windows\System32\drivers\etc\hosts`.
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- [Enable xDebug on php-fpm](#enablePhpXdebug)
|
- [Enable xDebug on php-fpm](#enablePhpXdebug)
|
||||||
|
|
||||||
@ -497,7 +497,7 @@ If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will
|
|||||||
- right-click on `tests/ExampleTest.php`
|
- right-click on `tests/ExampleTest.php`
|
||||||
- Select: `Debug 'ExampleTest.php'`.
|
- Select: `Debug 'ExampleTest.php'`.
|
||||||
- Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
|
- Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
|
||||||
- 
|
- 
|
||||||
|
|
||||||
|
|
||||||
<a name="UsagePHPStormDebugSite"></a>
|
<a name="UsagePHPStormDebugSite"></a>
|
||||||
@ -508,13 +508,13 @@ If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will
|
|||||||
`.php-fpm/xdebug stop`
|
`.php-fpm/xdebug stop`
|
||||||
|
|
||||||
- Start Remote Debugging
|
- Start Remote Debugging
|
||||||
- 
|
- 
|
||||||
|
|
||||||
- Open to edit: `bootstrap/app.php`
|
- Open to edit: `bootstrap/app.php`
|
||||||
- Add a BreakPoint on line 14: `$app = new Illuminate\Foundation\Application(`
|
- Add a BreakPoint on line 14: `$app = new Illuminate\Foundation\Application(`
|
||||||
- Reload [Laravel Site](http://laravel/)
|
- Reload [Laravel Site](http://laravel/)
|
||||||
- Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
|
- Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
|
||||||
- 
|
- 
|
||||||
|
|
||||||
|
|
||||||
<a name="SSHintoWorkspace"></a>
|
<a name="SSHintoWorkspace"></a>
|
||||||
@ -533,14 +533,14 @@ Assuming that you are in laradock folder, type:
|
|||||||
[Kitty](http://www.9bis.net/kitty/) KiTTY is a fork from version 0.67 of PuTTY.
|
[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:
|
- Here are some settings that are working for me:
|
||||||
- 
|
- 
|
||||||
- 
|
- 
|
||||||
- 
|
- 
|
||||||
- 
|
- 
|
||||||
- 
|
- 
|
||||||
- 
|
- 
|
||||||
- 
|
- 
|
||||||
- 
|
- 
|
||||||
- 
|
- 
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user