ykxiao/laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
415 Commits 1 Branch 159 Tags
15b3fe65c103b1653c37694290c46ed5a7b53505
Commit Graph
82 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mahmoud ZaltandGitHub 15b3fe65c1 Merge pull request #297 from lialosiu/master 
add build options MAX_ALLOWED_PACKET to mysql
 2016-09-09 13:04:49 -04:00
Mahmoud ZaltandGitHub a31cef6eb1 Merge pull request #294 from appleboy/patch-11 
Support ElasticSearch Container
 2016-09-07 09:42:09 -04:00
Mahmoud ZaltandGitHub a005281f4f Merge pull request #291 from luciano-jr/feature/vue-cli-workspace 
Feature/vue cli workspace
 2016-09-07 09:42:03 -04:00
Mahmoud ZaltandGitHub 53b0507eb2 Merge pull request #289 from Easter1021/patch-2 
modify words in Chinese
 2016-09-06 07:24:46 -04:00
Mahmoud ZaltandGitHub 4f5dfbcb13 Merge pull request #287 from luciano-jr/bugfix/php-fpm5.6-aerospike 
Bugfix/php fpm5.6 aerospike
 2016-09-05 21:58:09 -04:00
Mahmoud ZaltandGitHub a9ecdd0008 Merge pull request #284 from appleboy/patch-1 
Update postgres share volume path
 2016-09-04 05:26:40 -04:00
Mahmoud ZaltandGitHub 1dab0c48d8 Merge pull request #283 from appleboy/patch-10 
Add pgAdmin container
 2016-09-04 05:26:10 -04:00
Mahmoud ZaltandGitHub 91f1d4347c Merge pull request #278 from LarryEitel/remove-port-22-from-docker-compose-php-fpm 
remove port 22 from php-fpm because of conflict
 2016-09-04 05:22:30 -04:00
Mahmoud ZaltandGitHub 3473b788cf Merge pull request #275 from luciano-jr/feature/aerospike-cache 
Feature/aerospike cache
 2016-09-01 23:53:36 +03:00
Mahmoud ZaltandGitHub 79ff092105 Merge pull request #273 from LarryEitel/fix-xdebugPhpFpm 
fix-xdebugPhpFpm
 2016-09-01 11:47:33 +03:00
Mahmoud ZaltandGitHub 59a22aedac Merge pull request #270 from LarryEitel/add_apt-get_update_to_workspace_install_xdebug_block 
fix workspace xdebug install bug - need to add apt-get update.
 2016-08-30 20:30:37 +03:00
Mahmoud ZaltandGitHub adfb559521 Merge pull request #269 from LarryEitel/expose-port-22-and-add-insecure_id_rsa_ppk 
expose-port-22-and-add-insecure_id_rsa_ppk
 2016-08-30 17:29:51 +03:00
Mahmoud ZaltandGitHub 05e0e9c817 Merge pull request #264 from LarryEitel/expose-port-22-in-workspace-add-insecure_id_rsa_ppk 
expose-port-22-in-workspace-add-insecure_id_rsa_ppk
 2016-08-30 11:06:16 +03:00
Mahmoud ZaltandGitHub ab53db1897 Merge pull request #268 from appleboy/patch-10 
fix #267 phpmyadmin is not working on linux.
 2016-08-30 11:05:08 +03:00
Mahmoud ZaltandGitHub 6dcb174012 Merge pull request #266 from bktz/master 
Added support for RabbitMQ
 2016-08-30 11:03:57 +03:00
Mahmoud ZaltandGitHub 38eeae8791 Merge pull request #265 from computerfr33k/remove-env-commands-from-php-fpm 
Remove env commands from php fpm
 2016-08-30 11:03:27 +03:00
Mahmoud ZaltandGitHub de914d106f Merge pull request #262 from computerfr33k/260-reduce-data-only-volume-size 
use docker image which only supplies true & echo binaries.
 2016-08-30 11:01:33 +03:00
Mahmoud ZaltandGitHub 6c71d6d84f Merge pull request #261 from appleboy/patch-4 
support specific node version
 2016-08-30 10:59:50 +03:00
Mahmoud ZaltandGitHub 4e0af7e0cb Merge pull request #259 from computerfr33k/master 
Update caddy server and log to file
 2016-08-27 08:54:35 +03:00
Mahmoud ZaltandGitHub d6b091df96 Merge pull request #258 from helsont/patch-1 
Laravel 5.3 is published officially
 2016-08-27 08:53:53 +03:00
Mahmoud ZaltandGitHub 506fe598cd Merge pull request #257 from zhqagp/master 
Create README-zh.md
 2016-08-27 08:46:16 +03:00
Mahmoud ZaltandGitHub f2aea63d64 Merge pull request #250 from appleboy/patch-3 
add phpMyAdmin document.
 2016-08-25 00:10:52 +03:00
Mahmoud ZaltandGitHub df1a019f75 Merge pull request #246 from appleboy/patch-2 
update readme for phpMyAdmin.
 2016-08-24 00:38:21 +03:00
Mahmoud ZaltandGitHub 314034255a Merge pull request #245 from appleboy/patch-1 
Support phpMyAdmin container.
 2016-08-22 22:32:52 +03:00
Mahmoud ZaltandGitHub 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
Mahmoud ZaltandGitHub 5ee1fdd71b Merge pull request #236 from LarryEitel/re-tweak-readme-xdebug 
ReTweak README re xdebug
 2016-08-16 18:43:46 +03:00
Mahmoud ZaltandGitHub b42f24c50d Merge pull request #235 from LarryEitel/tweak-readme-xdebug 
Indent - Start/Stop xDebug in TOC
 2016-08-16 18:05:18 +03:00
Mahmoud ZaltandGitHub 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
Mahmoud ZaltandGitHub 28b4077a49 Merge pull request #229 from Kauhat/patch-1 
Remove hard-coded extensions from laravel.ini
 2016-08-15 17:57:30 +03:00
Mahmoud ZaltandGitHub a30bf83269 Merge pull request #228 from lialosiu/master 
add options INSTALL_ZIP_ARCHIVE to php-fpm
 2016-08-14 15:46:52 +03:00
Mahmoud ZaltandGitHub 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
Mahmoud ZaltandGitHub 27d3525469 Merge pull request #203 from davidavz/patch-1 
Update README.md
 2016-08-05 13:04:00 +03:00
Mahmoud ZaltandGitHub 8b6fdfed76 Merge pull request #208 from davidavz/patch-3 
Update README.md
 2016-08-05 13:03:47 +03:00
Mahmoud ZaltandGitHub 3c427d20c0 Merge pull request #204 from davidavz/patch-2 
Update README.md
 2016-08-05 13:03:35 +03:00
Mahmoud ZaltandGitHub 537f2c5033 Merge pull request #198 from computerfr33k/master 
minimize user switching in workspace build.
 2016-07-29 18:24:03 +03:00
Mahmoud ZaltandGitHub 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 ZaltandGitHub 04174b476c Merge pull request #196 from LaraDock/LaraDock-Native 
LaraDock Native (For Mac/Windows)
 2016-07-29 13:55:23 +03:00
Mahmoud ZaltandGitHub 2f20216d8f Merge pull request #189 from computerfr33k/apache2 
Add Apache2 Container
 2016-07-28 07:38:41 +03:00
Mahmoud ZaltandGitHub 33b701afdc Merge pull request #188 from computerfr33k/workspace-user 
Use workspace as non-root user
 2016-07-27 12:56:19 +03:00
Mahmoud ZaltandGitHub 5612874b78 Merge pull request #187 from LaraDock/faster-builds 
Faster builds
 2016-07-27 05:30:30 +03:00
Mahmoud ZaltandGitHub b1ec5b8d6f Merge pull request #186 from computerfr33k/caddy 
Update Caddyfile
 2016-07-27 02:09:59 +03:00
Mahmoud ZaltandGitHub 6e07061deb Merge pull request #184 from computerfr33k/nginx-alpine 
Nginx alpine image
 2016-07-27 02:09:00 +03:00
Mahmoud ZaltandGitHub 05e1dd4c13 Merge pull request #174 from orette/add-hhvm 
Add hhvm
 2016-07-24 07:27:40 +03:00
Mahmoud ZaltandGitHub 233cfb5b07 Merge pull request #169 from orette/create-code-standards-file 
Added dot file to maintain consistent coding styles
 2016-07-22 00:27:37 +03:00
Mahmoud ZaltandGitHub d5a51d4de9 Merge pull request #168 from appleboy/patch-2 
convert tab to space.
 2016-07-21 16:54:57 +03:00
Mahmoud ZaltandGitHub d6329c26b3 Merge pull request #165 from orette/mongodb-library-fix 
Added pkg-config to the PHP extentions and Tools that are installed from APT
 2016-07-21 05:35:04 +03:00
Mahmoud ZaltandGitHub 2799a94a9f Merge pull request #159 from computerfr33k/master 
Add caddy webserver container
 2016-07-20 07:41:45 +03:00
Mahmoud ZaltandGitHub fc303dee08 Merge pull request #151 from computerfr33k/issue-147 
Fix Memcached extension not installing
 2016-07-18 23:55:18 +03:00
Mahmoud ZaltandGitHub 06337e6024 Merge pull request #144 from appleboy/patch-7 
#140 update php 5.5 and 5.6
 2016-07-14 15:29:54 +03:00
Mahmoud ZaltandGitHub aeb5a6bb63 Merge pull request #140 from yewjs/patch-1 
Update Dockerfile-70
 2016-07-13 15:50:31 +03:00
Mahmoud ZaltandGitHub 2bbf59ddda Merge pull request #139 from Kauhat/master 
Database volume mapping changes & documentation
 2016-07-13 15:47:17 +03:00
Mahmoud ZaltandGitHub 1b9630e8a1 Merge pull request #132 from Niksac/fix-readme 
Update README.md
 2016-07-07 21:39:26 +03:00
Mahmoud ZaltandGitHub 65078505c1 Merge pull request #123 from appleboy/patch-6 
Added support upload file size setting.
 2016-06-28 16:06:29 +03:00
Mahmoud ZaltandGitHub 243392444f Merge pull request #122 from LaraDock/Hotfix/mongo 
Hotfix/mongo
 2016-06-27 14:00:09 +03:00
Mahmoud ZaltandGitHub 1af9dc5ac2 Merge pull request #121 from zhikiri/feature/mcrypt-extension 
Added supporting of the mcrypt extenstion
 2016-06-27 13:45:37 +03:00
Mahmoud ZaltandGitHub 3cd1f070e1 Merge pull request #118 from appleboy/patch-5 
remove duplicate white spaces
 2016-06-25 20:38:54 +03:00
Mahmoud ZaltandGitHub 44d8720400 Merge pull request #115 from appleboy/patch-2 
Change command about enter workspace container.
 2016-06-23 08:52:37 +03:00
Mahmoud ZaltandGitHub f0200626ba Merge pull request #114 from Kauhat/master 
Added support to conditionally install Prestissimo
 2016-06-23 08:36:48 +03:00
Mahmoud ZaltandGitHub ca413edff4 Merge pull request #112 from appleboy/patch-2 
Fixed Change wrong project name.
 2016-06-22 17:21:05 +03:00
Mahmoud ZaltandGitHub 2e930df2a7 Merge pull request #109 from appleboy/composer 
Load xdebug Zend extension with phpunit command.
 2016-06-22 16:57:08 +03:00
Mahmoud ZaltandGitHub 8d216f83d5 Merge pull request #101 from appleboy/gd 
Support gd extension.
 2016-06-16 17:47:04 +03:00
Mahmoud ZaltandGitHub ceba1af3ae Merge pull request #94 from AminMkh/AminMkh-mongodb-extension 
added php-mongodb extension
 2016-06-11 15:47:16 +03:00
Mahmoud Zalt 1148a3d051 Merge pull request #91 from LaraDock/xdebug 
Xdebug
 2016-06-03 15:06:57 +03:00
Mahmoud Zalt eda286ded2 Merge pull request #87 from LaraDock/appleboy-patch-1 
Appleboy patch 1 (fixing volumes mounting)
 2016-06-03 01:52:24 +03:00
Mahmoud Zalt 18bf12bfde Merge pull request #74 from abyshakes/master 
Issue #73 unable to install workspace container
 2016-05-26 21:17:51 +03:00
Mahmoud Zalt 86c6389650 Merge pull request #70 from Gummibeer/patch-2 
Issue #69
 2016-05-24 19:49:35 +03:00
Mahmoud Zalt 246c7366ba Merge pull request #68 from Gummibeer/patch-1 
Issue #67
 2016-05-24 13:23:13 +03:00
Mahmoud Zalt 11a13a0c33 Merge pull request #66 from AminMkh/workspace-postgres-driver 
added postgres driver
 2016-05-23 23:24:27 +03:00
Mahmoud Zalt ea9f5c635f Merge pull request #64 from AminMkh/master 
Update docker-compose.yml
 2016-05-23 23:00:09 +03:00
Mahmoud Zalt 73310e45e8 Merge pull request #62 from AminMkh/master 
Update README.MD
 2016-05-23 21:53:55 +03:00
Mahmoud Zalt 84e6b2b6ff Merge pull request #52 from mattythebatty/add-npm-bower-gulp 
Install node, npm, gulp and bower to the workspace container
 2016-05-18 22:49:31 +03:00
Mahmoud Zalt a434588a66 Merge pull request #50 from LaraDock/develop 
Develop
 2016-05-18 11:14:59 +03:00
Mahmoud Zalt e49836ba90 Merge pull request #48 from appleboy/patch-1 
Replace docker-compose rm with down command.
 2016-05-17 17:35:12 +03:00
Mahmoud Zalt 03c991c89d Merge pull request #47 from mattythebatty/php-5-memcached 
Add memcached support for PHP 5.5 & 5.6
 2016-05-14 19:47:37 +03:00
Mahmoud Zalt 88d5dd7806 Merge pull request #44 from mattythebatty/memcached-support 
Memcached support
 2016-05-12 15:12:46 +03:00
Mahmoud Zalt 26229e150d Merge pull request #35 from benmag/master 
link postgres service to php service
 2016-05-07 05:14:01 +03:00
Mahmoud Zalt 22f11e03ee Merge pull request #34 from benmag/master 
Add support for postgres
 2016-05-07 04:34:27 +03:00
Mahmoud Zalt daa5ed981f Merge pull request #32 from LaraDock/develop 
Major Updates
 2016-05-06 18:55:57 +03:00
Mahmoud Zalt 4f9271d565 Merge pull request #29 from chungth/master 
use git submodule instead of git clone when install
 2016-04-18 14:10:16 +03:00
Mahmoud Zalt bd88b95bb5 Merge pull request #13 from vitr/patch-1 
Update README.md (a typo)
 2016-03-10 05:32:21 +02:00
Mahmoud Zalt 45cc9908ad update the documentation design 2016-03-06 07:29:15 +02:00
Mahmoud Zalt 84e26f046b update the readme file 2016-02-26 13:24:55 +02:00