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

1746 Commits

Author SHA1 Message Date
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
Eric Pfeiffer 20adc9ca13 accidentally forgot to set INSTALL_NODE back to false. 2016-07-27 02:56:48 -05:00
Eric Pfeiffer dd9855d411 Update README.md 2016-07-27 02:49:43 -05:00
Eric Pfeiffer 17e252a436 add non-root user for workspace container. 2016-07-27 02:43:38 -05:00
Mahmoud Zalt dd06f1e1a0 Merge branch 'master' of https://github.com/LaraDock/laradock 
* 'master' of https://github.com/LaraDock/laradock:
 2016-07-27 05:45:10 +03:00
Mahmoud Zalt 2ba3060564 update the readme: switch to php 5.5 2016-07-27 05:44:36 +03:00
Mahmoud Zalt 5612874b78 Merge pull request #187 from LaraDock/faster-builds 
Faster builds
 2016-07-27 05:30:30 +03:00
Mahmoud Zalt 10af217349 update workspace build version 2016-07-27 04:39:54 +03:00
Mahmoud Zalt e65f0dceba add docker build version to the base image 2016-07-27 04:34:45 +03:00
Mahmoud Zalt c792a780ee use laradock php-fpm base images 
to speed up the build time
 2016-07-27 04:22:31 +03:00
Mahmoud Zalt 2d1c1586f5 use laradock workspace base image 
to speed up the build time
 2016-07-27 04:22:20 +03:00
Mahmoud Zalt 5bb3d3b6a8 rename PHP-FPM Dockerfile5 to Dockerfile56 2016-07-27 03:57:32 +03:00
Mahmoud Zalt b1ec5b8d6f Merge pull request #186 from computerfr33k/caddy 
Update Caddyfile
 2016-07-27 02:09:59 +03:00
Mahmoud Zalt 6e07061deb Merge pull request #184 from computerfr33k/nginx-alpine 
Nginx alpine image
 2016-07-27 02:09:00 +03:00
Eric Pfeiffer 97057f259c Update Caddyfile 
fixes 404 errors for files in the public folder, such as css or js files.
 2016-07-26 17:16:25 -05:00
Eric Pfeiffer e4f6cec536 fix nginx to actually log to files. 2016-07-26 12:53:26 -05:00
Eric Pfeiffer e6cf30e7ba re-added www-data user for nginx. log to stdout. 2016-07-26 12:41:52 -05:00
Eric Pfeiffer ed8e241007 use nginx:alpine as base. 2016-07-26 11:19:31 -05:00
Mahmoud Zalt c60cb9ab40 return `apt-get update` to HHVM 2016-07-25 07:47:17 +03:00
Mahmoud Zalt d58ef06907 refactoring some containers 2016-07-25 07:31:31 +03:00
Mahmoud Zalt 462b5685eb add some comments sections to the php dockerfiles 2016-07-25 07:27:15 +03:00
Mahmoud Zalt 11f7cfe729 fix an error missed COMPOSER_GLOBAL_INSTALL 2016-07-25 07:15:26 +03:00
Mahmoud Zalt d5ffc04034 remove data and application containers from the readme 2016-07-25 07:05:24 +03:00
Mahmoud Zalt 062b7466f6 add composer.json to install global composer dependencies 2016-07-25 07:00:50 +03:00