Commit Graph

2026 Commits

Author SHA1 Message Date
牟勇 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
Bagus Erlang abdcfa1002
Update index.md 2019-12-04 15:38:52 +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
Lan Phan 50b6272fff
Merge pull request #2372 from lanphan/fix_workspace
Remove duplicated laravel installer code
2019-11-24 01:31:23 +07: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
StefanT123 c3620e95c8 Volumes are created on every docker start (#2247)
* Added graylog to the list of softwares.

* Added persistent volumes for docker-in-docker and graylog.

Added volume for mongo configdb.
These services were making volumes on every start, so we might end up with many unnecessary volumes.
With this pull request this issue is resolved.
2019-11-14 05:22:41 +07:00
Valentino Lauciani 4e5a142c9d YAML extension for php-cli (#2360)
* Add 'WORKSPACE_INSTALL_YAML' variable to install php yaml extension for php-cli

* Set 'INSTALL_YAML' variable to install php yaml extension for php-cli

* Install yaml extension for php-cli
2019-11-14 05:08:54 +07:00
Mahmoud Zalt c6ad0a1a2d Remove a dead link from the documentation 2019-11-13 19:58:39 +01:00
Lan Phan d4e65a40ff
Merge pull request #2352 from goodjack/patch-2
Use default user
2019-11-11 22:25:49 +07:00
Lan Phan 8aeb64ea37
Merge pull request #2305 from ubc/1745-php-fpm-uid-gid
Run php-fpm as different user (#1745)
2019-11-11 22:10:35 +07:00
Lan Phan 3cdc771abd
Merge pull request #2330 from amorZhu/master
Install supervisord in the workspace
2019-11-07 21:23:45 +07:00
小克 10c28a14fa Use default user 2019-11-02 21:19:37 +08:00
Júnior Araújo 402ea8747a
Install MongoDB drivers 2019-11-01 14:35:23 -03:00
Anton Sannikov 7ad82a3cd1 Added nginx settings for confluence 2019-10-31 11:58:38 +03:00
Anton Sannikov 83ba1447d4 Merged with master 2019-10-31 11:37:56 +03:00
Alone 41438e9c31 add install supervisor document 2019-10-28 17:55:36 +08:00
Alone 8b2bcc6d15 add config file for supervisord 2019-10-28 17:33:13 +08:00
Alone 75acb9f8a5 Merge remote-tracking branch 'upstream/master' 2019-10-28 16:19:03 +08:00
Lan Phan c09261e99e
Merge pull request #2319 from lbssousa/devcontainer
Add sample configuration for Visual Studio Code Remote Development
2019-10-25 23:47:03 +07:00
Lan Phan b34b052c64
Merge pull request #1968 from Ishodnikov/patch-1
Set my.cnf permissions
2019-10-25 23:31:17 +07:00
Lan Phan 18237b467b
Merge pull request #2293 from pelicancode/patch-1
MySql config file permissions fix
2019-10-25 23:24:17 +07:00
Lan Phan b08385b03e
Merge pull request #2340 from computamike/UpdatingDocs
Update Confluence section
2019-10-25 23:21:59 +07:00
Lukas Besch 7247d8f7ce Install default-mysql-client for PHP 7.3 (#2329)
Install default-mysql-client for PHP 7.3
2019-10-25 23:15:40 +07:00
Mike Hingley f5c00c61be
Update Confluence section
The original text was confusing.  Refactored to attempt to make more sense.
2019-10-25 17:12:59 +01:00
Lan Phan d82734744e
Merge pull request #2339 from computamike/master
fix slight typo
2019-10-25 23:03:57 +07:00
Mike Hingley ef9eee2def
fix slight typo 2019-10-25 16:45:46 +01:00
Alone 6764a88fe6 Install supervistor in the workspace 2019-10-16 18:18:03 +08:00
Laércio de Sousa b7b468765a Add sample configuration for Visual Studio Code Remote Development on Containers. 2019-10-08 09:39:30 -03:00
Shao Yu-Lung (Allen) 04c6aaf338
Merge pull request #2215 from stefnats/gearman
Implement Gearman Message broker & PHP Extension
2019-10-07 17:08:29 +08:00
Shao Yu-Lung (Allen) 4af8ac8f53
fix syntex error (#2317)
* fix syntex error cause by #2309
2019-10-07 17:06:09 +08:00
Shao Yu-Lung (Allen) 25f883fc99
laravel-horizon: fix memcached (#2316)
Fix #2278
2019-10-07 16:19:19 +08:00
Edwin Hui 8755e445d9 CHANGE_SOURCE arg missing for php-fpm (#2311) 2019-10-07 11:18:44 +08:00
Shao Yu-Lung (Allen) 153e65d6a7
Merge pull request #2193 from skipworkgh/mailparse
Added support for the mailparse php pecl extension
2019-10-07 11:03:10 +08:00
Shao Yu-Lung (Allen) 9428a4b781
Merge branch 'master' into mailparse 2019-10-07 11:02:57 +08:00
Shao Yu-Lung (Allen) 747cfaf583
Merge pull request #2309 from sodabrew/patch-1
Use released versions of memcached extension
2019-10-07 11:00:31 +08:00
Shao Yu-Lung (Allen) dfb0f731f5
Merge pull request #2303 from akccakcctw/fix/readme_maintainers_link
Fix README.md maintainers links
2019-10-07 10:58:13 +08:00