Commit Graph

1689 Commits

Author SHA1 Message Date
Mahmoud Zalt 26ee54a4ad Merge pull request #992 from zuohuadong/patch-3
git key  to pull code
2017-06-07 09:42:47 +03:00
zuohuadong cbfd160cbf Fix 2017-06-06 18:11:31 +08:00
Bo-Yi Wu 7207ccbbeb upgrade caddy to 0.10.3 version (#994) 2017-06-04 07:29:13 -05:00
Winfried 6e09e2a774 Merge pull request #964 from MyController/php56mssql
Dockerfile-56 fill missing MSSQL section
2017-06-04 12:15:36 +02:00
Mark Davidson 0561199914 Add Kibana Container (#993)
* Add Kibana Container

* Add Kibana Port to env-example
2017-06-02 23:54:37 -05:00
zuohuadong 430a5f21cf git key to pull code
git key  to pull code
2017-06-02 13:53:13 +08:00
mycontroller 0290142bf4 Dockerfile-56 fill missing MSSQL section 2017-05-31 13:41:30 +08:00
MyController 5745a50d15 Merge pull request #1 from laradock/master
跟进主干
2017-05-31 13:39:13 +08:00
Mahmoud Zalt 18b6c1b907 Merge pull request #984 from Obscuresounds/workspace-fix-bash-command-not-found
Exec issue with workspace bugfix
2017-05-30 17:51:05 +03:00
Mahmoud Zalt 4a663649c0 Merge pull request #983 from cre8/master
Add laravel echo server
2017-05-30 17:50:08 +03:00
Mahmoud Zalt 7c9d7a6de6 Merge pull request #965 from aven-li/master
fix mongodb php extension config
2017-05-30 17:49:33 +03:00
Mahmoud Zalt d0e5d50712 Update readme 2017-05-30 17:41:11 +03:00
Lawrence Eldridge d0c0a8895e add global instance of larval installer for fresh projects. (#988) 2017-05-30 09:05:30 -05:00
Diego Vieira e23ecb6a11 fix mssql startup (#985)
- Sleep 45s is invalid
- /opt/mssql/bin/sqlservr is the correct path for mssql binary
2017-05-30 09:05:09 -05:00
Mirko da60b32a04 add laravel echo server 2017-05-27 15:24:50 +02:00
Lawrence Eldridge 5a47080859 This issue relates to https://github.com/laradock/laradock/issues/563, which also occurs on Mac. This has been one of the solutions proposed. 2017-05-27 14:07:45 +01:00
Yu-Lung Shao (Allen) f296a39bf5 Merge pull request #975 from bestlong/fix-jenkins-permission-denied
fix jenkins permission denied
2017-05-25 07:40:20 -05:00
Shao Yu Lung f04acee6df fix jenkins permission denied 2017-05-25 20:04:21 +08:00
Yu-Lung Shao (Allen) 992c76d29c Merge pull request #974 from bestlong/adminer-support-sqlsrv
adminer support mssql
2017-05-25 04:49:07 -05:00
Shao Yu Lung f3a016aa79 adminer support mssql 2017-05-25 16:44:51 +08:00
Yu-Lung Shao (Allen) 58995966ec Merge pull request #972 from bestlong/put-data-in-tmp-folder-may-lost-and-no-permit
Change DATA_SAVE_PATH default value avoid lost data
2017-05-24 21:53:38 -05:00
Shao Yu Lung c913c429c0 change DATA_SAVE_PATH 2017-05-25 10:04:41 +08:00
Shao Yu Lung d4caddcaed move default config DATA_SAVE_PATH from /tmp to ~/.laradocc/data
avoid lost data and windows no have /tmp folder.
2017-05-25 09:56:14 +08:00
Yu-Lung Shao (Allen) 8d7b3a84be Merge pull request #971 from bestlong/adjustment-travis-ci
[Travis-CI] using set -x could produce more debug info.
2017-05-24 20:40:55 -05:00
Shao Yu Lung fc8ffe5731 using set -x could produce more debug info. 2017-05-25 09:33:40 +08:00
Luciano Jr bf691337f1 Merge pull request #20 from laradock/master
Just update the fork
2017-05-24 17:56:05 +01:00
avenli 9e81f92d58 fix mongodb php extension config 2017-05-24 14:47:12 +08:00
Colin Schoen bf4a5beb0b Fix typo (#962)
sumit -> submit
2017-05-23 13:52:19 +08:00
Yu-Lung Shao (Allen) 3288c20658 Merge pull request #958 from bestlong/mssql-ext-build-failed
Fixing php-fpm install mssql extension build failed
2017-05-19 22:31:00 -05:00
Shao Yu Lung 5a8df95fd3 fixing PHP7.0 php-fpm mssql extension build failed 2017-05-20 10:35:41 +08:00
Shao Yu Lung 43545cefd2 fixing PHP7.1 php-fpm mssql extension build failed 2017-05-20 09:20:00 +08:00
Yu-Lung Shao (Allen) 71364f962e fix php-fpm show warning not install extension (#954) 2017-05-19 17:00:13 +08:00
Winfried b2ad5f16e8 Merge pull request #888 from tristanbailey/patch-1
Update Redis Docker File
2017-05-16 02:58:12 +02:00
Winfried 5dc4db40f7 Merge pull request #939 from Viktorminator/patch-1
Update index.md
2017-05-14 20:50:29 +02:00
Winfried cec83afe45 Merge pull request #943 from wxb/master
edit docker-compose.yml, add swoole config
2017-05-14 20:48:39 +02:00
wxb 01f6d8f038 edit docker-compose.yml, add swoole config 2017-05-15 02:07:45 +08:00
Winfried a90a3c1d28 Merge pull request #941 from zeroc0d3/master
Update badges laradock
2017-05-14 10:44:23 +02:00
ZeroC0D3 Team a1bc99ef4e Update badges laradock 2017-05-14 14:21:50 +07:00
Viktor Matushevskyi 35efcc4a7c Update index.md 2017-05-13 20:51:19 +03:00
Yu-Lung Shao (Allen) c85fd97e00 Merge pull request #938 from bestlong/percona-use-data-save-path
Percona service use DATA_SAVE_PATH env var
2017-05-13 10:00:33 -05:00
Mahmoud Zalt 895a24f332 Adding amazing members to the Laradock team
Welcome @sixlive and @bestlong :)
2017-05-13 17:41:44 +03:00
Shao Yu Lung 6ff7f4a402 percona service use DATA_SAVE_PATH env var, same way mysql, mariadb. 2017-05-13 22:04:35 +08:00
Mahmoud Zalt 109e596417 Merge pull request #937 from bestlong/fix-percona-create-multiple-db-user-cant-see
Fixing Percona service create multiple db solution
2017-05-13 16:47:43 +03:00
Shao Yu Lung 20fddc6de7 fix percona service create multiple db solution user can’t see other db problem. 2017-05-13 21:37:25 +08:00
Winfried 1eaac78fdd Merge pull request #936 from bestlong/fix-mariadb-create-multiple-db-user-cant-see
Fixing MariaDB service create multiple db solution
2017-05-13 13:45:40 +02:00
Shao Yu Lung 855241d966 fix mariadb service create multiple db solution user can’t see other db problem. 2017-05-13 11:00:36 +08:00
Mahmoud Zalt be9f7f8346 Merge pull request #935 from xpert13/patch-1
Fix #934. Add extra_hosts to php-worker container
2017-05-13 05:48:25 +03:00
Mahmoud Zalt b5431bc061 Merge pull request #933 from bestlong/php-fpm-ldap-support
php-fpm service LDAP support
2017-05-13 05:48:06 +03:00
Mahmoud Zalt 783da59b59 Merge pull request #929 from ciliehub/master
correct xdebug sed in workspace
2017-05-13 05:47:33 +03:00
Alex 41574fe026 Fix #934. Add extra_hosts to php-worker container 2017-05-12 17:17:38 +03:00