ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
609 Commits 1 Branch 159 Tags 14 MiB
Commit Graph

609 Commits

Author SHA1 Message Date
Philippe Trépanier 2728a99986 Merge pull request #496 from cosmospham/master 
Fix PHP 5.6 Dockerfile syntax error
 2016-12-20 02:29:59 -05:00
Cosmos Pham 5bb515751a Fix PHP 5.6 Dockerfile syntax error 
Syntax error: ";" unexpected
 2016-12-20 13:20:53 +07:00
Philippe Trépanier ea148943ed Merge pull request #495 from philtrep/related-projects 
Added related projects to docs
 2016-12-19 10:57:25 -05:00
philtrep 97f882e4c7 Added related projects to docs 2016-12-19 10:55:44 -05:00
Bo-Yi Wu e9d3a838f1 Merge pull request #491 from laradock/bug 
fix #490 duplication of key "volumes"
 2016-12-16 17:23:01 +08:00
Bo-Yi Wu 380eef5fd9 fix #490 duplication of key "volumes" 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-12-16 17:21:45 +08:00
Bo-Yi Wu 047e7f7cc3 Merge pull request #489 from laradock/yarn 
Support specific version of yarn.
 2016-12-16 10:58:38 +08:00
Bo-Yi Wu b8142222e5 Support specific version of yarn. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-12-16 09:36:08 +08:00
Philippe Trépanier b62d9bcb60 Merge pull request #488 from abtrumpet/add-soap 
Added SOAP option to php-fpm install.
 2016-12-15 17:59:40 -05:00
Austin Benesh da6b950623 Added SOAP option to php-fpm install. 2016-12-15 12:13:27 -07:00
Philippe Trépanier 9d60dad222 Merge pull request #486 from dlnsk/mysql_strict_fix 
Fix mysql strict NO_ZERO_DATE
 2016-12-15 10:14:22 -05:00
Dmitry Pupinin 6ffa36f188 Fix mysql strict NO_ZERO_DATE 2016-12-15 21:51:22 +07:00
Philippe Trépanier f82d3b30b4 Merge pull request #483 from edmundluong/master 
Add option to install Google V8 Javascript Engine PHP extension
 2016-12-13 20:22:20 -05:00
Edmund Luong 8bacb129c6 Add option to install Google V8 Javascript Engine PHP extension 2016-12-13 20:00:48 -05:00
Philippe Trépanier 99fb1b4169 Merge pull request #474 from AliveCorpse/master 
Fix load of mongodb library
 2016-12-12 13:37:13 -05:00
Bo-Yi Wu 6c9d5866b4 Merge pull request #477 from thebrubaker/patch-1 
Update Readme.md
 2016-12-12 08:58:27 +08:00
Joel Brubaker e8ef7ab8c9 Update Readme.md 
Very small grammar updates.
 2016-12-11 14:41:10 -08:00
Philippe Trépanier 5da5d5e29c Merge pull request #476 from jbaron-mx/master 
Fix typos and missing commas in docs
 2016-12-11 10:34:58 -05:00
Jesus Baron 19a2110b06 Fix typos and missing commas in docs 2016-12-10 22:22:40 -06:00
Vladimir Kirejko 2fab33d4e4 Fix load of mongodb library 
```
PHP Warning: PHP Startup: Unable to load dynamic library '/usr/lib/php/20151012/mongodb.so' - /usr/lib/php/20151012/mongodb.so: undefined symbol: php_json_serializable_ce in Unknown on line 0
```
 2016-12-09 21:13:04 +02:00
Philippe Trépanier 4f819c238c Merge pull request #451 from Blaasvis/master 
Update MySQL startup script
 2016-11-28 22:53:32 -05:00
Blaasvis d8875cb588 Update startup 2016-11-28 21:25:52 +01:00
Bo-Yi Wu bb9f65eb2a Merge pull request #445 from danielabbatt/patch-1 
Update README.md
 2016-11-26 01:33:50 +08:00
Daniel Abbatt d6508f3bb3 Update README.md 
Fixed typo on "environment"
 2016-11-25 16:59:13 +00:00
Philippe Trépanier a3288462a8 Merge pull request #434 from dlnsk/Fixes 
Fixes for nginx and mysql
 2016-11-25 01:51:25 -05:00
Philippe Trépanier 225fb8cf4f Merge pull request #384 from LarryEitel/phpstorm-guide 
phpstorm-debugging-guide
 2016-11-18 16:03:33 -05:00
larryeitel f67edee5e5 LaraDock-PHPStorm Debugging Guide 
-	modified:   README.md
-	new file:   _guides/photos/KiTTY/Connection.png
-	new file:   _guides/photos/KiTTY/ConnectionData.png
-	new file:   _guides/photos/KiTTY/ConnectionSSH.png
-	new file:   _guides/photos/KiTTY/ConnectionSSHAuth.png
-	new file:   _guides/photos/KiTTY/Session.png
-	new file:   _guides/photos/KiTTY/Terminal.png
-	new file:   _guides/photos/KiTTY/TerminalKeyboard.png
-	new file:   _guides/photos/KiTTY/TerminalShell.png
-	new file:   _guides/photos/KiTTY/Window.png
-	new file:   _guides/photos/KiTTY/WindowAppearance.png
-	new file:   _guides/photos/PHPStorm/DebugRemoteOn.png
-	new file:   _guides/photos/PHPStorm/RemoteDebuggingSuccess.png
-	new file:   _guides/photos/PHPStorm/RemoteHost.png
-	new file:   _guides/photos/PHPStorm/RemoteTestDebuggingSuccess.png
-	new file:   _guides/photos/PHPStorm/RemoteWebDebuggingSuccess.png
-	new file:   _guides/photos/PHPStorm/Settings/BuildDeploymentConnection.png
-	new file:   _guides/photos/PHPStorm/Settings/BuildDeploymentConnectionMappings.png
-	new file:   _guides/photos/PHPStorm/Settings/BuildDeploymentDebugger.png
-	new file:   _guides/photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png
-	new file:   _guides/photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png
-	new file:   _guides/photos/PHPStorm/Settings/LangsPHPDebug.png
-	new file:   _guides/photos/PHPStorm/Settings/LangsPHPInterpreters.png
-	new file:   _guides/photos/PHPStorm/Settings/LangsPHPPHPUnit.png
-	new file:   _guides/photos/PHPStorm/Settings/LangsPHPServers.png
-	new file:   _guides/photos/PHPStorm/Settings/WindowsFirewallAllowedApps.png
-	new file:   _guides/photos/PHPStorm/Settings/WindowsHyperVManager.png
-	new file:   _guides/photos/PHPStorm/Settings/hosts.png
-	new file:   _guides/photos/SimpleHostsEditor/AddHost_laravel.png
-	new file:   _guides/phpstorm.md
 2016-11-18 14:12:10 -06:00
Philippe Trépanier e5a8fb9c95 Merge pull request #437 from philtrep/fix-mysql-change-env 
Added proper creation of mysql user, removal of default homestead user
 2016-11-18 10:12:37 -05:00
philtrep 4ef5db3713 Added proper creation of mysql user, removal of default homestead user 2016-11-17 16:37:51 -05:00
Dmitry Pupinin 6bbd1fbe19 Use mysql 5.7 with disabled option ONLY_FULL_GROUP_BY (which causes many problem to people) 2016-11-16 16:16:52 +07:00
Dmitry Pupinin d703c82c46 Exclude sites configuration from image and just use volume 2016-11-16 15:58:42 +07:00
Mahmoud Zalt ecc4e06740 Merge pull request #432 from philtrep/port-already-allocated 
Added 'port is already allocated' error to the docs debugging section
 2016-11-15 09:20:37 -05:00
philtrep 8b09149b15 Added 'port is already allocated' error to the docs debugging section 2016-11-14 20:48:59 -05:00
Mahmoud Zalt 380178e6fa Merge pull request #429 from philtrep/mysql-bind-port 
Added mysql change port bind documentation
 2016-11-14 11:34:02 -05:00
Mahmoud Zalt be64b54606 Merge pull request #428 from laradock/appleboy-patch-1 
fixed #420 remove phpmyadmin volume setting.
 2016-11-14 11:32:55 -05:00
philtrep cbeeb48aa1 Added mysql change port binnd documentation 2016-11-14 11:24:28 -05:00
Bo-Yi Wu 7e2814168a fixed #420 remove phpmyadmin volume setting. 2016-11-14 23:45:52 +08:00
Mahmoud Zalt 5e9ae56a7f Merge pull request #419 from laradock/yarn 
Revert #418 and fix install yarn package management.
 2016-11-10 09:32:19 -05:00
Bo-Yi Wu 5d98e78dba Revert #418 and fix install yarn package management. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-11-10 10:23:49 +08:00
Mahmoud Zalt c5d1116333 Merge pull request #418 from moxar/yarn 
Fix a bug that prevents yarn from installing #415
 2016-11-09 15:17:42 -05:00
Alexandre Thomas 5594c53e03 Fix bug in PATH 2016-11-09 17:55:35 +01:00
Alexandre Thomas 44045f85e6 Fix a bug that prevents yarn from installing 2016-11-09 16:14:49 +01:00
Mahmoud Zalt fc31a2415c Merge pull request #414 from joaojoyce/postgis-support 
Postgis Support
 2016-11-08 09:45:31 -05:00
João Joyce a42f62c626 Postgis 2016-11-08 13:17:23 +00:00
Mahmoud Zalt 3e4a5edc64 Merge pull request #407 from michaeljhopkins/patch-2 
Add solution to mysql connection issues
 2016-11-05 18:52:53 -04:00
Michael Hopkins 9289c1b6c0 Add solution to mysql connection issues 
Adding in a more "docker conventional" solution to the mysql connection issues
 2016-11-05 06:42:19 -06:00
Bo-Yi Wu 3f157a3277 Merge pull request #403 from darthrevan13/patch-1 
Fix for mariadb local path
 2016-11-03 23:02:16 +08:00
Mahmoud Zalt f732bb283b update the workspace container version 2016-11-03 09:50:21 -04:00
Mahmoud Zalt ca4aeada08 add missing step to the docs 2016-11-03 09:50:10 -04:00
darthrevan13 3d54d68aa1 Fix for mariadb local path 
When running docker-compose with mariadb the following message will appear:

ERROR: for mariadb  Cannot create container for service mariadb: Invalid volume spec "mariadb": Invalid volume destination path: 'mariadb' mount path must be absolute.
ERROR: Encountered errors while bringing up the project.

This commit fixes the issue.
 2016-11-03 15:45:59 +02:00