a31cef6eb1
Merge pull request #294 from appleboy/patch-11
...
Support ElasticSearch Container
2016-09-07 09:42:09 -04:00
a005281f4f
Merge pull request #291 from luciano-jr/feature/vue-cli-workspace
...
Feature/vue cli workspace
2016-09-07 09:42:03 -04:00
907c694834
update readme for ElasticSearch.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com >
2016-09-07 16:44:33 +08:00
8c392e94f2
Support ElasticSearch Container.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com >
2016-09-07 15:18:54 +08:00
db6c6e7e0f
Merge pull request #13 from luciano-jr/feature/vue-cli-workspace
...
Add vue-cli on workspace npm global installers
2016-09-06 23:44:14 +01:00
d538274a0f
Add vue-cli on workspace npm global installers
2016-09-06 23:43:03 +01:00
beeea8dc0e
Merge pull request #12 from LaraDock/master
...
Update fork
2016-09-06 22:14:21 +01:00
53b0507eb2
Merge pull request #289 from Easter1021/patch-2
...
modify words in Chinese
2016-09-06 07:24:46 -04:00
a1a5b3d49f
modify words in Chinese
...
let words look like smooth and replace wrong word in Chinese.
2016-09-06 17:46:14 +08:00
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
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
6cc58de67e
Add aerospike extension installation on phpfpm-56 as well
2016-09-04 14:50:03 +01:00
b2da8aeb3f
Merge pull request #10 from LaraDock/master
...
Update fork
2016-09-04 14:36:12 +01:00
1345164ac3
refactor RabbitMQ Dockerfile
2016-09-04 06:33:08 -04:00
a9ecdd0008
Merge pull request #284 from appleboy/patch-1
...
Update postgres share volume path
2016-09-04 05:26:40 -04:00
1dab0c48d8
Merge pull request #283 from appleboy/patch-10
...
Add pgAdmin container
2016-09-04 05:26:10 -04:00
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
4013553dbb
Update postgres share volume path
2016-09-04 09:04:18 +08:00
07e4bd174e
Add pgAdmin doc.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com >
2016-09-03 21:32:02 +08:00
7999399e9a
Add pgAdmin container.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com >
2016-09-03 21:24:36 +08:00
d684cb4742
remove port 22 from php-fpm because of conflict
2016-09-02 10:38:15 -06:00
3c27c14b99
Merge pull request #9 from LaraDock/master
...
Update fork
2016-09-02 10:45:20 +01:00
3473b788cf
Merge pull request #275 from luciano-jr/feature/aerospike-cache
...
Feature/aerospike cache
2016-09-01 23:53:36 +03:00
1a5c7a7b3f
Update documentation
2016-09-01 15:24:39 +01:00
616e9c7d92
Merge pull request #8 from luciano-jr/feature/aerospike-cache
...
Feature/aerospike cache
2016-09-01 13:24:30 +01:00
a3039958e3
Fix conflicts
2016-09-01 13:23:40 +01:00
b01bae59fc
Fix volumes aerospike section
2016-09-01 13:21:21 +01:00
92dc3be3b1
Remove duplicate argument on aerospike section
2016-09-01 13:05:53 +01:00
650f6a89c6
Remove own namespace from conf file
2016-09-01 12:58:10 +01:00
041d134f69
Merge pull request #7 from LaraDock/master
...
Just update the fork
2016-09-01 12:56:35 +01:00
79ff092105
Merge pull request #273 from LarryEitel/fix-xdebugPhpFpm
...
fix-xdebugPhpFpm
2016-09-01 11:47:33 +03:00
ffce0f93d5
Fix: ERROR: expr: syntax error #272
2016-08-31 05:52:03 -06:00
a2d154c30a
Merge branch 'master' of github.com:LarryEitel/laradock
2016-08-31 05:46:36 -06:00
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
b42ad1ae7e
fix workspace xdebug install bug - need to add apt-get update.
2016-08-30 11:26:54 -06:00
07d6ec85ca
Merge branch 'master' of github.com:LarryEitel/laradock
2016-08-30 08:40:28 -06:00
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
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
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
6dcb174012
Merge pull request #266 from bktz/master
...
Added support for RabbitMQ
2016-08-30 11:03:57 +03:00
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
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
6c71d6d84f
Merge pull request #261 from appleboy/patch-4
...
support specific node version
2016-08-30 10:59:50 +03:00
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
1e5d604470
Added support for RabbitMQ
2016-08-28 18:12:55 +10:00
314e43bb79
Update Dockerfile-56
2016-08-28 00:04:52 -05:00
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
d441427852
Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users.
2016-08-27 17:22:36 -06:00
227c8da17c
Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users.
2016-08-27 17:00:01 -06:00
14b97caa57
Merge branch 'master' of github.com:LarryEitel/laradock
2016-08-27 14:52:28 -06:00
