ykxiao/laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
639 Commits 1 Branch 159 Tags
3f13aa4f50e3346fea90cdafb9b1cdfdb6ce01de
Commit Graph

639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mahmoud Zalt
a1ade52cd6 Merge pull request #369 from LaraDock/patch 
fixed #363 PHP_IDE_CONFIG variable.
 2016-10-31 08:08:48 -04:00
Mahmoud Zalt
05f4f371fe Merge pull request #396 from LaraDock/appleboy-patch-1 
Update caddy version and fix format.
 2016-10-31 08:05:45 -04:00
Bo-Yi Wu
33e99ca9cf update format. 2016-10-31 14:58:39 +08:00
Bo-Yi Wu
e913fd941e Update caddy version and fix format. 2016-10-31 14:36:44 +08:00
Bo-Yi Wu
5286fd654a remove redundant spaces 2016-10-31 14:33:57 +08:00
Mahmoud Zalt
499342ea39 Merge pull request #391 from hopewise/master 
clarified where to run xdebugPhpFpm command
 2016-10-26 19:59:09 -04:00
Samir Sabri
17442db357 clarified where to run xdebugPhpFpm command 
As users might run the command `xdebugPhpFpm`  in the php-fpm container rather than from outside.
 2016-10-26 15:21:18 +03:00
Bo-Yi Wu
4f7b0ec0c3 Merge pull request #390 from LaraDock/elasticsearch 
Add install elasticsearch plugin section.
 2016-10-26 11:16:00 +08:00
Bo-Yi Wu
a0981aa836 Add install elasticsearch plugin section. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-10-26 09:40:53 +08:00
Mahmoud Zalt
6a3137fc27 Merge pull request #388 from philtrep/ssh-documentation 
Added Documentation for using ssh on workspace
 2016-10-24 16:47:59 -04:00
philtrep
4d5e3e5e4a Added Documentation for using ssh on workspace 2016-10-24 16:11:52 -04:00
Philippe Trépanier
aa7c52c42e Merge pull request #386 from dilone/master 
update Workspace port to 2222
 2016-10-24 14:44:08 -04:00
Dilone
6eed8199df update port to 2222 - no conflict linux 2016-10-24 03:58:03 -04:00
Philippe Trépanier
c02f17417f Merge pull request #375 from calebfavor/apache-php-double-quote-fix 
Removing double quotes for apache php fpm configuration.
 2016-10-17 19:34:35 -04:00
calebfavor
91bae76527 No longer using env variable to set the apache php socket config variable. 2016-10-17 16:05:35 -07:00
calebfavor
891911ddc3 Removing double quotes for apache php fpm configuration. 2016-10-17 14:17:23 -07:00
Mahmoud Zalt
89fac4bdbe Merge pull request #371 from imamassi/master 
Quick steps to resolve connection refused error
 2016-10-16 22:59:19 -04:00
Imam Assidiqqi
22a3bbc0b0 Quick steps to resolve connection refused error 2016-10-16 07:51:49 +07:00
Bo-Yi Wu
89a21ccf1b fixed #363 PHP_IDE_CONFIG variable. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-10-15 08:50:17 +08:00
Philippe Trépanier
15892dba51 Merge pull request #367 from aletundo/Fix_mysql_dockerfile 
Fixed mysql tag dockerfile
 2016-10-14 16:12:19 -04:00
Alessandro Tundo
1fa1dc9a1c Fixed mysql tag dockerfile 
Signed-off-by: Alessandro Tundo <alessandrotundo94@gmail.com>
 2016-10-14 21:04:24 +02:00
Mahmoud Zalt
c4cd3ed2ac Merge pull request #365 from geocine/nginx-charset-utf8 
use utf8 charset on nginx
v4.7.5 		2016-10-14 14:31:56 -04:00
Aivan Monceller
ffe45fed50 use utf8 charset on nginx 2016-10-15 01:01:59 +08:00
Mahmoud Zalt
bd1f6ebd8a Merge pull request #364 from LaraDock/downgrade-mysql 
downgrade MySQL to 5.6 (stable)
 2016-10-14 12:28:42 -04:00
Mahmoud Zalt
f35e5501db downgrade MySQL to 5.6 (stable) 2016-10-14 12:26:11 -04:00
Bo-Yi Wu
8d1ba2e802 Merge pull request #361 from LaraDock/yarn 
Support Yarn package manager for JavaScript
v4.7.4 		2016-10-13 20:04:19 -05:00
Bo-Yi Wu
c9415b12c0 Add YARN flag in production mode.. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-10-14 09:01:50 +08:00
Bo-Yi Wu
8544de7ea1 update readme. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-10-13 14:48:00 +08:00
Bo-Yi Wu
62e0f0443c Support Yarn MANAGEMENT tool. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-10-13 12:06:30 +08:00
Mahmoud Zalt
a2847316c4 Merge pull request #358 from appleboy/patch-22 
convert tab to spaces.
 2016-10-11 12:49:43 -04:00
Bo-Yi Wu
9d212afc8c convert tab to spaces. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-10-11 20:17:21 +08:00
Mahmoud Zalt
89a77bee24 Merge pull request #354 from philtrep/change-timezone 
Added timezone arguments to workspace build
 2016-10-10 10:44:30 -04:00
philtrep
fb26035e5c Added timezone arguments to workspace build 2016-10-10 09:44:25 -04:00
Mahmoud Zalt
c7a76dd683 add LaraDock v4 Video link :D 2016-10-10 08:57:52 -04:00
Mahmoud Zalt
781f5ff972 add missing info to the readme 2016-10-10 07:32:01 -04:00
Mahmoud Zalt
5c0e55204e add folder structures to the README 2016-10-10 04:30:15 -04:00
Mahmoud Zalt
dd3ab5ade1 add warning to the readme asking people to rebuild their containers 2016-10-10 03:50:44 -04:00
Mahmoud Zalt
2e5d2a743c disable xdebug remote by default v4.7.3 2016-10-09 20:47:08 -04:00
Mahmoud Zalt
5635b47c6f refactor the workspace docker file 2016-10-09 20:27:03 -04:00
Mahmoud Zalt
56f422ade0 replace true parameters by false as the default 2016-10-09 20:05:33 -04:00
Mahmoud Zalt
58d6d8e745 Merge pull request #352 from LaraDock/revert-db-ports 
Revert ports fowarding for MySQL and MariaDB
 2016-10-09 16:52:29 -04:00
Mahmoud Zalt
7ecb712e76 Revert ports fowarding for MySQL and MariaDB 
Include production docker compose file
 2016-10-09 16:51:18 -04:00
Philippe Trépanier
3abb6152c8 Merge pull request #351 from philtrep/readme-mysql-host-access 
Added instructions for forward the MySQL/MariaDB port to README
 2016-10-09 13:57:57 -04:00
philtrep
5221544b98 Added instructions for forward the MySQL/MariaDB port to README 2016-10-09 13:52:33 -04:00
Philippe Trépanier
2396b4799c Merge pull request #350 from geocine/cannot-open-nvm-sh-fix 
fix for issue #347
 2016-10-09 13:12:19 -04:00
Aivan Monceller
08fa1bc95c fix for issue #347 2016-10-10 01:06:10 +08:00
Mahmoud Zalt
2415566230 general updates to the readme 2016-10-09 02:26:50 -04:00
Bo-Yi Wu
5fea003ffe update installation. 2016-10-09 11:19:50 +08:00
Mahmoud Zalt
e9af2a4fb3 Merge branch 'master' of https://github.com/LaraDock/laradock 
* 'master' of https://github.com/LaraDock/laradock:
  Fix typo in README: Giude -> Guide
  Added laravel cronjob
  Added cron files copying to workspace crontab
  Remove port fowarding for MySQL and MariaDB
  Added NVM binaries in root bashrc
 2016-10-06 17:57:18 -04:00
Mahmoud Zalt
d0dea21cc5 update readme credits section 2016-10-06 17:55:41 -04:00