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

2207 Commits

Author SHA1 Message Date
Shao Yu-Lung (Allen) fc5ab30d4f
Merge pull request #2424 from appleboy/locale 
chore(php-fpm): update the default locale setting.
 2019-12-19 20:08:55 +08:00
Shao Yu-Lung (Allen) 89a1ac652e
Merge pull request #2276 from jzonta/add_oci8_supports 
Added support for OCI8 extension in workspace and php-fpm containers.
 2019-12-19 20:07:34 +08:00
Shao Yu-Lung (Allen) d732318e52
Merge pull request #2273 from Insua/master 
fix(compose file): add missing config for inotify and fswatch
 2019-12-17 20:48:15 +08:00
Shao Yu-Lung (Allen) ccf85148e8
Merge branch 'master' into master 2019-12-17 20:47:56 +08:00
Shao Yu-Lung (Allen) 378900ee38
Merge pull request #2365 from amorZhu/master 
update document for workspace supervisor
 2019-12-17 20:44:31 +08:00
kideny 30c91c7f94 fixed 2019-12-15 23:21:51 +08:00
Shao Yu-Lung (Allen) e943d90ca2
Merge pull request #2427 from lbssousa/devcontainer-v3 
Drop unneeded settings for devcontainer.json (VSCode already handles them automatically)
 2019-12-12 08:37:50 +08:00
Laércio de Sousa d847c1a8c5 Drop unneeded settings for devcontainer.json (VSCode already handles them automatically). 2019-12-11 15:18:34 -03:00
Shao Yu-Lung (Allen) ace85c38d7
Merge pull request #2425 from bestlong/php-fpm-use-new-base-image 
php-fpm base image use 2.6.2
 2019-12-12 00:13:14 +08:00
Shao Yu Lung be48366190 php-fpm base image use 2.6.2 2019-12-11 21:18:57 +08:00
Bo-Yi Wu a1d7d46573 chore(php-fpm): update the default locale setting. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2019-12-11 14:28:14 +08:00
Rafael Meira 0da0f302d3
Update env-example 2019-12-10 11:12:53 -03:00
Rafael Meira a010010d97
remove this file use master 2019-12-10 11:11:54 -03:00
Rafael Meira 44f1d456b2
remove this file 2019-12-10 11:11:32 -03:00
Rafael Meira 0edeb8fb71
remove this file 2019-12-10 11:11:11 -03:00
Rafael Meira 77c8429ea1
Update dockerfile add new version from mssql 2019-12-10 11:10:32 -03:00
Rafael Meira 3ba74dd1c3
Update pid for sql MSSQL 2019-12-10 11:07:58 -03:00
Shao Yu-Lung (Allen) fb617deb86
Merge pull request #2413 from lbssousa/devcontainer-v2 
Complete sample configuration for VSCode Remote Development on Containers
 2019-12-09 18:42:27 +08:00
Shao Yu-Lung (Allen) 5a25b786f3
add php7.4.ini (#2420) 2019-12-09 18:40:52 +08:00
Laércio de Sousa 88d06bb838 Complete sample configuration for VSCode Remote Development on Containers 2019-12-06 13:50:32 -03:00
Shao Yu-Lung (Allen) bc6ba25790
update travis ci config (#2412) 2019-12-06 21:04:03 +08:00
Shao Yu-Lung (Allen) 3889363443
fix build arg [NVM_NODEJS_ORG_MIRROR] not consumed warning (#2411) 2019-12-06 20:43:59 +08:00
Shao Yu-Lung (Allen) 42c580af1f
fix CHANGE_SOURCE duplicate (#2410) 2019-12-06 20:23:28 +08:00
Shao Yu-Lung (Allen) a954732145
Merge pull request #2253 from xiagw/add-tomcat 
Add tomcat
 2019-12-06 20:03:43 +08:00
Shao Yu-Lung (Allen) f608c6a45d
Merge branch 'master' into add-tomcat 2019-12-06 20:01:54 +08:00
Shao Yu-Lung (Allen) 53558480e8
Merge pull request #2342 from yamotuki/fix_xhprof_version 
change to newer version of tideways/php-xhprof-extension
 2019-12-06 19:45:12 +08:00
Shao Yu-Lung (Allen) 76b046f321
Merge branch 'master' into fix_xhprof_version 2019-12-06 19:44:45 +08:00
Shao Yu-Lung (Allen) 818d61ab54
Merge pull request #1905 from mouyong/master 
change some container source when in china
 2019-12-06 19:25:02 +08:00
Shao Yu-Lung (Allen) c6fe34db11
Merge pull request #2290 from hastinbe/add-ast-ext 
Add AST extension
 2019-12-06 19:21:57 +08:00
Shao Yu-Lung (Allen) dec428a748
Merge branch 'master' into add-ast-ext 2019-12-06 19:21:09 +08:00
Shao Yu-Lung (Allen) 9cea74dc6f
update travis ci config (#2409) 2019-12-06 19:17:22 +08:00
Shao Yu-Lung (Allen) a190f11e8f
Merge pull request #2322 from Fernando-Larios/master 
add GETTEXT extension php-fpm
 2019-12-06 09:39:49 +08:00
牟勇 f3e3bbe2b7 refactor: 还原 nginx.conf 文件名 2019-12-06 09:35:10 +08:00
Shao Yu-Lung (Allen) 91041e9c56
Merge pull request #2388 from amorZhu/master 
Improve user experience in China
 2019-12-06 09:32:00 +08:00
牟勇 84db9b079d refactor: 还原 xdebug.ini 2019-12-06 09:30:11 +08:00
Shao Yu-Lung (Allen) 64573a407f
Merge pull request #2402 from erlangp/patch-4 
fix typo of repo name
 2019-12-06 09:27:29 +08:00
Bagus Erlang ed6be69cc1
typo 2019-12-06 03:50:41 +08:00
牟勇 838156b1bd refactor: remove some option 2019-12-05 13:28:42 +08:00
牟勇 9bdeaa3682 fix: fix cannot install imagemagick extension problem 2019-12-05 13:21:10 +08:00
牟勇 c84db7d4d7 fix: fix the extension cannot install problem. 2019-12-05 11:48:27 +08:00
Shao Yu-Lung (Allen) a7faceba37
Merge pull request #2343 from zill057/master 
Add CHANGE_SOURCE option for php-worker
 2019-12-05 11:41:30 +08:00
Shao Yu-Lung (Allen) f27c186b93
Merge pull request #2393 from vladyslavstartsev/cachetool-php-fpm 
Added CacheTool
 2019-12-05 11:40:40 +08:00
牟勇 2c9563d2cd feat: restore some file 2019-12-05 11:27:44 +08:00
牟勇 dab5ff1ac6 feat: restore mysql/my.cnf 2019-12-05 11:26:01 +08:00
牟勇 5a0c905457 feat: change source 2019-12-05 11:23:51 +08:00
牟勇 b6204e5933 pref: add change source flag 2019-12-05 11:16:32 +08:00
牟勇 ba23f41322 Merge branch 'master' of https://github.com/Laradock/laradock 2019-12-05 11:11:29 +08:00
Shao Yu-Lung (Allen) 4b0f58f1b2
Merge pull request #2347 from asannikov/confluence 
Confluence
 2019-12-05 10:50:30 +08:00
Shao Yu-Lung (Allen) b753c0580e
Merge pull request #2350 from walterjrp/patch-2 
laravel-horizon support Install MongoDB drivers
 2019-12-05 10:49:24 +08:00
Shao Yu-Lung (Allen) 8474acdf17
Update env-example 2019-12-05 10:47:31 +08:00