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

2208 Commits

Author SHA1 Message Date
Mahmoud Zalt 4e0af7e0cb Merge pull request #259 from computerfr33k/master 
Update caddy server and log to file
 2016-08-27 08:54:35 +03:00
Mahmoud Zalt d6b091df96 Merge pull request #258 from helsont/patch-1 
Laravel 5.3 is published officially
 2016-08-27 08:53:53 +03:00
Mahmoud Zalt 506fe598cd Merge pull request #257 from zhqagp/master 
Create README-zh.md
 2016-08-27 08:46:16 +03:00
Eric Pfeiffer b252558560 fix caddy Dockerfile from previous commit. 2016-08-26 14:01:48 -05:00
Eric Pfeiffer 29d714a849 caddy log to file. enable gzip compression. 2016-08-26 13:26:22 -05:00
Eric Pfeiffer f9fd391879 update caddy to v0.9.1 2016-08-26 13:25:31 -05:00
Helson Taveras 740b4647a3 Laravel 5.3 is published officially 
No need for development branch switch.

Ran into the same error posted by this guy here https://laracasts.com/discuss/channels/laravel/laravel-53-cant-do-php-artisan-optimize.

I didn't switch to the development branch and the setup worked perfectly.
 2016-08-26 11:29:32 -04:00
zhqagp f8d3c58d6a Create README-zh.md 
中文翻译版README
 2016-08-26 12:38:51 +08:00
Mahmoud Zalt 509cb9ac2e replace the phpmyadmin guide in the readme 2016-08-25 00:19:58 +03:00
Mahmoud Zalt f2aea63d64 Merge pull request #250 from appleboy/patch-3 
add phpMyAdmin document.
 2016-08-25 00:10:52 +03:00
Luciano Gonçalves 9aa8813a3d Add aerospike.conf 2016-08-24 16:29:29 +01:00
Luciano Jr 58af86a582 Merge pull request #6 from LaraDock/master 
Update fork
 2016-08-24 12:36:52 +01:00
Bo-Yi Wu 12ba6bbbae add phpMyAdmin document. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-08-24 14:25:42 +08:00
Mahmoud Zalt 9fb50b2c6b fix phpmyadmin port. closes #247 2016-08-24 00:43:11 +03:00
Mahmoud Zalt df1a019f75 Merge pull request #246 from appleboy/patch-2 
update readme for phpMyAdmin.
 2016-08-24 00:38:21 +03:00
Bo-Yi Wu c68f70d2a7 fix typo 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-08-23 16:56:23 +08:00
Bo-Yi Wu 002b147b23 update readme for phpMyAdmin. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-08-23 16:56:14 +08:00
Mahmoud Zalt 314034255a Merge pull request #245 from appleboy/patch-1 
Support phpMyAdmin container.
 2016-08-22 22:32:52 +03:00
Bo-Yi Wu 3c8861d1d2 remove empty data folder for mariadb. 
ref:
d969a465ee/10.1/Dockerfile (L83)

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-08-22 11:02:21 +08:00
Bo-Yi Wu 2d51548879 support phpmyadmin container. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-08-22 11:01:34 +08:00
Mahmoud Zalt 4aa3902f32 Merge pull request #242 from LarryEitel/install-and-startup-workspace-ssh 
Install and start workspace ssh
 2016-08-22 03:30:17 +03:00
Luciano Gonçalves 1afad7f14c Add configuration to install aerospike php extension 2016-08-20 19:05:38 +01:00
Luciano Jr 00d48fff51 Merge pull request #5 from LaraDock/master 
Just update
 2016-08-20 12:32:32 +01:00
Luciano Gonçalves 9bd70aadc8 Added aerospike cache service 2016-08-20 12:28:45 +01:00
Mahmoud Zalt fb049ef300 create guides folder and clean the readme 2016-08-19 03:24:02 +03:00
Mahmoud Zalt e75da747a9 general clean up 2016-08-19 03:05:36 +03:00
Mahmoud Zalt dd48592d8b update the xdebug.ini usage 2016-08-19 03:05:02 +03:00
Mahmoud Zalt d57a0c3888 rename and refactor xdebug config files 2016-08-19 03:03:45 +03:00
Larry Eitel 7a13e4a343 Fix variable name 2016-08-17 19:53:01 -06:00
larryeitel 4e7e003e87 ssh keys 2016-08-17 19:24:00 -06:00
larryeitel 208b2e7c0a ReTweak README re xdebug 2016-08-17 07:56:38 -06:00
larryeitel 9611fdb58f Indent - Start/Stop xDebug in TOC 2016-08-17 07:56:38 -06:00
Mahmoud Zalt 9a77c8e276 Merge branch 'multi-sites' of https://github.com/tjb328/laradock into multiple-projects 
* 'multi-sites' of https://github.com/tjb328/laradock:
  Fix typo
  Allow for config of crush and opcache in the main docker file
  This is a better Drupal nginx config. Built from a combination of contributions from here: https://groups.drupal.org/node/305633 https://www.nginx.com/resources/wiki/start/topics/recipes/drupal/
  Add Drush and Opcache to laradock because they are needed for drupal development.
  Add drupal 8 example to make laradock framework agnostic.
 2016-08-17 01:53:55 +03:00
Mahmoud Zalt 080cc2a88a Merge branch 'master' of https://github.com/LaraDock/laradock into multiple-projects 
* 'master' of https://github.com/LaraDock/laradock:
  ReTweak README re xdebug
  Indent - Start/Stop xDebug in TOC
 2016-08-17 01:52:55 +03:00
Tim Bracken b648f1ca58 Fix typo 2016-08-16 17:53:15 -04:00
Tim Bracken cfc81fca64 Allow for config of crush and opcache in the main docker file 2016-08-16 17:51:41 -04:00
Tim Bracken 928451ae88 This is a better Drupal nginx config. Built from a combination of contributions from here: 
https://groups.drupal.org/node/305633
https://www.nginx.com/resources/wiki/start/topics/recipes/drupal/
 2016-08-16 16:32:59 -04:00
Tim Bracken 95ef5e1e70 Add Drush and Opcache to laradock because they are needed for drupal development. 2016-08-16 15:13:58 -04:00
Tim Bracken c324114b7a Add drupal 8 example to make laradock framework agnostic. 2016-08-16 15:08:27 -04:00
Mahmoud Zalt 5ee1fdd71b Merge pull request #236 from LarryEitel/re-tweak-readme-xdebug 
ReTweak README re xdebug
 2016-08-16 18:43:46 +03:00
larryeitel 7680e29bc5 ReTweak README re xdebug 2016-08-16 09:23:56 -06:00
Mahmoud Zalt b42f24c50d Merge pull request #235 from LarryEitel/tweak-readme-xdebug 
Indent - Start/Stop xDebug in TOC
 2016-08-16 18:05:18 +03:00
larryeitel 1c22c009e7 Indent - Start/Stop xDebug in TOC 2016-08-16 08:55:29 -06:00
Mahmoud Zalt 380c7bd1ec Merge branch 'multi-sites-branch' of https://github.com/LarryEitel/laradock into multi-sites 
* 'multi-sites-branch' of https://github.com/LarryEitel/laradock:
  Proof of concept - LaraDock hosting multiple sites
 2016-08-16 15:56:19 +03:00
Mahmoud Zalt e8562272b0 update the readme: update contributing giude 2016-08-16 15:47:42 +03:00
Mahmoud Zalt 1614f0fb2d update the readme: add production section (with DO) 2016-08-16 15:38:01 +03:00
Mahmoud Zalt 5232d6a84f update the readme: add xDebug docs 2016-08-16 15:28:30 +03:00
Mahmoud Zalt 391602a811 Merge branch 'LarryEitel-xdebugPhpFpm' 
* LarryEitel-xdebugPhpFpm:
  Provided a way to Stop/Start php-fpm xdebug via bash script.
 2016-08-16 15:16:01 +03:00
Mahmoud Zalt b4760ac703 Merge branch 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock into LarryEitel-xdebugPhpFpm 
* 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock:
  Provided a way to Stop/Start php-fpm xdebug via bash script.
 2016-08-16 15:13:42 +03:00
Mahmoud Zalt aabb0cded8 upgrade php-fpm base image 2016-08-16 15:12:52 +03:00