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

655 Commits

Author SHA1 Message Date
Luciano Jr f275f88396 Merge pull request #11 from luciano-jr/bugfix/php-fpm5.6-aerospike 
Add aerospike extension installation on phpfpm-56 as well
 2016-09-04 14:55:12 +01:00
Luciano Gonçalves 6cc58de67e Add aerospike extension installation on phpfpm-56 as well 2016-09-04 14:50:03 +01:00
Luciano Jr b2da8aeb3f Merge pull request #10 from LaraDock/master 
Update fork
 2016-09-04 14:36:12 +01:00
Mahmoud Zalt 1345164ac3 refactor RabbitMQ Dockerfile 2016-09-04 06:33:08 -04:00
Mahmoud Zalt a9ecdd0008 Merge pull request #284 from appleboy/patch-1 
Update postgres share volume path
 2016-09-04 05:26:40 -04:00
Mahmoud Zalt 1dab0c48d8 Merge pull request #283 from appleboy/patch-10 
Add pgAdmin container
 2016-09-04 05:26:10 -04:00
Mahmoud Zalt 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
Bo-Yi Wu 4013553dbb Update postgres share volume path 2016-09-04 09:04:18 +08:00
Bo-Yi Wu 07e4bd174e Add pgAdmin doc. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-09-03 21:32:02 +08:00
Bo-Yi Wu 7999399e9a Add pgAdmin container. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-09-03 21:24:36 +08:00
larryeitel d684cb4742 remove port 22 from php-fpm because of conflict 2016-09-02 10:38:15 -06:00
Luciano Jr 3c27c14b99 Merge pull request #9 from LaraDock/master 
Update fork
 2016-09-02 10:45:20 +01:00
Mahmoud Zalt 3473b788cf Merge pull request #275 from luciano-jr/feature/aerospike-cache 
Feature/aerospike cache
 2016-09-01 23:53:36 +03:00
Luciano Gonçalves 1a5c7a7b3f Update documentation 2016-09-01 15:24:39 +01:00
Luciano Jr 616e9c7d92 Merge pull request #8 from luciano-jr/feature/aerospike-cache 
Feature/aerospike cache
 2016-09-01 13:24:30 +01:00
Luciano Gonçalves a3039958e3 Fix conflicts 2016-09-01 13:23:40 +01:00
Luciano Gonçalves b01bae59fc Fix volumes aerospike section 2016-09-01 13:21:21 +01:00
Luciano Gonçalves 92dc3be3b1 Remove duplicate argument on aerospike section 2016-09-01 13:05:53 +01:00
Luciano Gonçalves 650f6a89c6 Remove own namespace from conf file 2016-09-01 12:58:10 +01:00
Luciano Jr 041d134f69 Merge pull request #7 from LaraDock/master 
Just update the fork
 2016-09-01 12:56:35 +01:00
Mahmoud Zalt 79ff092105 Merge pull request #273 from LarryEitel/fix-xdebugPhpFpm 
fix-xdebugPhpFpm
 2016-09-01 11:47:33 +03:00
larryeitel ffce0f93d5 Fix: ERROR: expr: syntax error #272 2016-08-31 05:52:03 -06:00
larryeitel a2d154c30a Merge branch 'master' of github.com:LarryEitel/laradock 2016-08-31 05:46:36 -06:00
Mahmoud Zalt 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
larryeitel b42ad1ae7e fix workspace xdebug install bug - need to add apt-get update. 2016-08-30 11:26:54 -06:00
larryeitel 07d6ec85ca Merge branch 'master' of github.com:LarryEitel/laradock 2016-08-30 08:40:28 -06:00
Mahmoud Zalt 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 Zalt 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 Zalt 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 Zalt 6dcb174012 Merge pull request #266 from bktz/master 
Added support for RabbitMQ
 2016-08-30 11:03:57 +03:00
Mahmoud Zalt 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 Zalt 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 Zalt 6c71d6d84f Merge pull request #261 from appleboy/patch-4 
support specific node version
 2016-08-30 10:59:50 +03:00
Bo-Yi Wu 7b2ff6dab8 fix #267 phpmyadmin is not working on linux. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-08-30 13:16:18 +08:00
Benjamin Katznelson 1e5d604470 Added support for RabbitMQ 2016-08-28 18:12:55 +10:00
Eric Pfeiffer 314e43bb79 Update Dockerfile-56 2016-08-28 00:04:52 -05:00
Eric Pfeiffer ea047e2587 remove unnecessary env commands 
These environment variables are not needed since they are only being used at build time and we are already specifying them using the ARG command, no need to specify it twice since it increases build time and size.
 2016-08-28 00:04:19 -05:00
larryeitel d441427852 Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users. 2016-08-27 17:22:36 -06:00
larryeitel 227c8da17c Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users. 2016-08-27 17:00:01 -06:00
larryeitel 14b97caa57 Merge branch 'master' of github.com:LarryEitel/laradock 2016-08-27 14:52:28 -06:00
Eric Pfeiffer 6ba76da709 use docker image which only supplies true & echo binaries. 2016-08-27 13:18:13 -05:00
Bo-Yi Wu 294fe31a80 update nvm version. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-08-27 22:54:59 +08:00
Bo-Yi Wu 78be0b577e support specific node version 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-08-27 19:38:44 +08:00
Mahmoud Zalt 5a980b1c97 add debugging steps for thr 404 windows error 2016-08-27 10:00:09 +03:00
Mahmoud Zalt 3ad474a2d9 move contributing to the root 2016-08-27 09:06:22 +03:00
Mahmoud Zalt 0ad1e58bf0 Merge branch 'master' of https://github.com/LaraDock/laradock 
* 'master' of https://github.com/LaraDock/laradock:
  fix caddy Dockerfile from previous commit.
  caddy log to file. enable gzip compression.
  update caddy to v0.9.1
  Laravel 5.3 is published officially
  Create README-zh.md
 2016-08-27 08:57:15 +03:00
Mahmoud Zalt 0cf12c7383 update the readme 2016-08-27 08:57:03 +03:00
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