Commit Graph

2590 Commits

Author SHA1 Message Date
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
Shao Yu-Lung (Allen)
4afc747bf5
Update docker-compose.yml 2019-12-05 10:46:24 +08:00
Shao Yu-Lung (Allen)
0a4e832371
Merge pull request #2395 from erlangp/patch-1
lowercase
2019-12-05 10:35:55 +08:00
Shao Yu-Lung (Allen)
e53632404f
Merge pull request #2370 from jcs224/postgres-confuence-init-fix
Fix confluence / postgres init
2019-12-05 10:35:27 +08:00
Shao Yu-Lung (Allen)
2d27fc36e8
Merge pull request #2398 from bestlong/update-doc
update document
2019-12-05 10:30:06 +08:00
Shao Yu Lung
9e5ff1888e update document 2019-12-05 10:29:08 +08:00
Shao Yu-Lung (Allen)
8f53cea9f7
Merge pull request #2378 from bkarstaedt/patch-1
Update to Kibana 7.1.1
2019-12-05 08:42:56 +08:00
Shao Yu-Lung (Allen)
5026effcac
Merge pull request #2397 from bestlong/php74
Support PHP 7.4, #2387.
2019-12-05 08:22:46 +08:00
Shao Yu Lung
351f19b8fe support PHP 7.4, #2387. 2019-12-04 23:02:35 +08:00
Claudio Ludovico
d40abcb939
Add arg to laravel-horizon service 2019-12-04 11:40:04 +00:00
Claudio Ludovico
c11c1fd69d
Add ffmpeg directive to Dockerfile 2019-12-04 11:38:36 +00:00
Claudio Ludovico
754e61d15f
Add key to install ffmpeg in horizon 2019-12-04 11:36:47 +00:00
Bagus Erlang
abdcfa1002
Update index.md 2019-12-04 15:38:52 +08:00
Vladyslav Startsev
f5f1f45858 added cachetool to invalidate shared php cache (APCu, OPcache) without reloading PHP-FPM 2019-12-03 12:53:42 +02:00
alone
497878557c Remove the sources.sh Ubuntu_Source parameter 2019-12-01 00:02:59 +08:00
Shao Yu-Lung (Allen)
272222b7f1
Merge pull request #2389 from bestlong/increase_upload_filesize
phpMyAdmin increase upload filesize to 2G
2019-11-30 18:39:57 +08:00
Shao Yu Lung
919cfc0c87 increase update filesize to 2G
#2344
2019-11-30 18:26:16 +08:00
alone
fe2631649c add sources.sh for workspace 2019-11-30 09:06:09 +08:00
alone
c64be9969f delete php-fpm args UBUNTU_SOURCE 2019-11-30 08:54:29 +08:00
alone
24361ca818 add ubuntu sources.list 2019-11-30 08:51:23 +08:00
alone
b5314e5769 Merge remote-tracking branch 'upstream/master' 2019-11-29 02:20:02 +08:00
Lan Phan
50b6272fff
Merge pull request #2372 from lanphan/fix_workspace
Remove duplicated laravel installer code
2019-11-24 01:31:23 +07:00
alone
461e05d677 change workspace ubuntu sources.list file 2019-11-18 03:24:27 +08:00
alone
aff7d9d615 add nvm NVM_NODEJS_ORG_MIRROR 2019-11-18 03:05:13 +08:00
bkarstaedt
440002f0fc
Update to Kibana 7.1.1
When spinning up the stack via `docker-compose -d apache2 elasticsearch kibana` Kibana won't work currently and displays "kibana is not ready yet". `docker-compose logs kibana` the message:

```
{"type":"log","@timestamp":"2019-11-14T15:46:37Z","tags":["status","plugin:reporting@6.6.0","error"],"pid":1,"state":"red","message":"Status changed from uninitialized to red - This version of Kibana requires Elasticsearch v6.6.0 on all nodes. I found the following incompatible nodes in your cluster: v7.1.1 @ 172.26.0.3:9200 (172.26.0.3)","prevState":"uninitialized","prevMsg":"uninitialized"}
```

I update the version to align with elasticsearchs' version which works fine on my machine.
2019-11-15 09:52:48 +01:00
Lan Phan
d3e505cd73 remove duplicated laravel installer code 2019-11-14 22:34:23 +07:00
Joe Sweeney
07c019b672
Fix confluence / postgres init 2019-11-13 22:10:41 -07:00