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

2369 Commits

Author SHA1 Message Date
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
Mahmoud Zalt d3a6116a42 move PHP Memcached from the base image to LaraDock 2016-08-16 15:12:35 +03:00
Mahmoud Zalt eb81dfc1be Merge pull request #232 from tianissimo/dev-memcached-ext 
Added PHP Memcached extension installation for PHP 5.6
 2016-08-16 13:33:46 +03:00
Suteepat Damrongyingsupab a6e04aa659 Added PHP Memcached extension installation for PHP 5.6 2016-08-16 16:31:52 +07:00
larryeitel 93504a714d Proof of concept - LaraDock hosting multiple sites 2016-08-15 15:14:05 -06:00
larryeitel d8a4537efb Provided a way to Stop/Start php-fpm xdebug via bash script. 2016-08-15 09:28:32 -06:00
Mahmoud Zalt 28b4077a49 Merge pull request #229 from Kauhat/patch-1 
Remove hard-coded extensions from laravel.ini
 2016-08-15 17:57:30 +03:00
Jack Fletcher 651430c7a9 Update Dockerfile-56 2016-08-15 15:01:47 +01:00
Jack Fletcher 3be9dee1c7 Update Dockerfile-70 2016-08-15 15:00:37 +01:00
Jack Fletcher 8ef37a71fb Remove hard-coded extensions from laravel.ini 2016-08-15 14:57:51 +01:00
Luciano Jr 5210ca7ccf Merge pull request #4 from LaraDock/master 
Just update
 2016-08-15 07:34:40 +01:00
Mahmoud Zalt a30bf83269 Merge pull request #228 from lialosiu/master 
add options INSTALL_ZIP_ARCHIVE to php-fpm
 2016-08-14 15:46:52 +03:00
Lialosiu 1fdf800988 add options INSTALL_ZIP_ARCHIVE to php-fpm 2016-08-14 15:53:08 +08:00
Mahmoud Zalt 82cbad75d4 Update the reamde: list more awesome contributors 2016-08-11 21:24:20 +03:00
Mahmoud Zalt 6111ca5ff7 Merge pull request #222 from tianissimo/dev-workspace-node-fix 
Fixed nvm/node installation not working.
 2016-08-11 21:14:39 +03:00
Suteepat Damrongyingsupab b393996d44 Fixed nvm/node installation not working. 2016-08-11 18:03:27 +07:00
Mahmoud Zalt f12028576c upgrade the workspace base image to 1.1 2016-08-10 22:25:41 +03:00
Mahmoud Zalt 27d3525469 Merge pull request #203 from davidavz/patch-1 
Update README.md
 2016-08-05 13:04:00 +03:00
Mahmoud Zalt 8b6fdfed76 Merge pull request #208 from davidavz/patch-3 
Update README.md
 2016-08-05 13:03:47 +03:00
Mahmoud Zalt 3c427d20c0 Merge pull request #204 from davidavz/patch-2 
Update README.md
 2016-08-05 13:03:35 +03:00
David 57c003722e Update README.md 2016-08-04 23:10:27 +02:00
David ab4c44a434 Update README.md 2016-08-03 22:50:45 +02:00
David 0f7969c999 Update README.md 2016-08-03 22:44:26 +02:00
Mahmoud Zalt aa8f7c48a5 upgrade the php-fpm base images 2016-08-03 22:28:33 +03:00
Mahmoud Zalt 533925522c add CONTRIBUTING.md 2016-08-03 13:08:00 +03:00
Mahmoud Zalt 48a6c06ebb update readme: better overview 2016-07-29 18:39:24 +03:00
Mahmoud Zalt 537f2c5033 Merge pull request #198 from computerfr33k/master 
minimize user switching in workspace build.
 2016-07-29 18:24:03 +03:00
Eric Pfeiffer f36f9ef6ec minimize user switching in build. 2016-07-29 10:16:06 -05:00
Mahmoud Zalt 605c191717 add more info for upgrading docker in the reamdme 2016-07-29 14:53:25 +03:00
Mahmoud Zalt f2615b9ff2 Merge pull request #194 from Kauhat/fix-composer 
Fix user permissions issue when installing Composer in the workspace container
 2016-07-29 14:01:48 +03:00
Mahmoud Zalt 04174b476c Merge pull request #196 from LaraDock/LaraDock-Native 
LaraDock Native (For Mac/Windows)
 2016-07-29 13:55:23 +03:00
Mahmoud Zalt afac432b2f upgrade readme to docker native 2016-07-29 13:52:16 +03:00
Mahmoud Zalt 2f156edafd Fix syntax error in the beanstalkd-console dockerfile 2016-07-29 13:19:44 +03:00
Jack Fletcher 42d551dead Fix user permissions issue when installing Composer in the workspace 
container
 2016-07-29 09:59:38 +01:00
Maelle b7d38ef7dd parameter data in the path 2016-07-28 11:49:42 +02:00
Mahmoud Zalt c5ac8d1ada add apache to the readme 2016-07-28 08:08:41 +03:00
Mahmoud Zalt 2f20216d8f Merge pull request #189 from computerfr33k/apache2 
Add Apache2 Container
 2016-07-28 07:38:41 +03:00
Eric Pfeiffer 5e0e120950 add apache2 container. 2016-07-27 19:35:58 -05:00
Mahmoud Zalt 33b701afdc Merge pull request #188 from computerfr33k/workspace-user 
Use workspace as non-root user
 2016-07-27 12:56:19 +03:00
Eric Pfeiffer e0c18374df Merge branch 'workspace-user' of github.com:computerfr33k/laradock into workspace-user 2016-07-27 02:56:59 -05:00