From 2743eaf63d50d5d4eed02388cda7812e981bc635 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 20 Jan 2021 17:11:03 -0500 Subject: [PATCH 1/2] increase fcgi timeout, add blurb re: built in code --- README.md | 7 +++++++ readme-vars.yml | 6 ++++++ root/defaults/default | 1 + 3 files changed, 14 insertions(+) diff --git a/README.md b/README.md index be9152d..57cd5bc 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,12 @@ If you are not customizing our default nginx configuration you will need to remo ``` Then restart the container to replace it with the latest one. +### Collaborative Editing + +Nextcloud's built-in collaborative editing packages (Collabora and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons. + +If (auto) installed, those built-in packages may cause instability and should be removed. + ## Docker Mods [![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=nextcloud&query=%24.mods%5B%27nextcloud%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=nextcloud "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") @@ -240,6 +246,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.01.21:** - Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container). * **16.01.21:** - Rebasing to alpine 3.13 * **12.08.20:** - Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container). * **03.06.20:** - Rebasing to alpine 3.12 diff --git a/readme-vars.yml b/readme-vars.yml index 5421c3a..be28557 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -66,10 +66,16 @@ app_setup_block: | ``` Then restart the container to replace it with the latest one. + ### Collaborative Editing + + Nextcloud's built-in collaborative editing packages (Collabora and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons. + + If (auto) installed, those built-in packages may cause instability and should be removed. # changelog changelogs: + - { date: "20.01.21:", desc: "Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container)." } - { date: "16.01.21:", desc: "Rebasing to alpine 3.13" } - { date: "12.08.20:", desc: "Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container)." } - { date: "03.06.20:", desc: "Rebasing to alpine 3.12" } diff --git a/root/defaults/default b/root/defaults/default index 524f8e4..a8e20fd 100644 --- a/root/defaults/default +++ b/root/defaults/default @@ -87,6 +87,7 @@ server { fastcgi_pass php-handler; fastcgi_intercept_errors on; fastcgi_request_buffering off; + fastcgi_read_timeout 3600; } location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) { try_files $uri/ =404; From 60106fa00f8b675378a76f298413fa218f1ecaa1 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 20 Jan 2021 17:17:03 -0500 Subject: [PATCH 2/2] add link to docs re: libseccomp --- README.md | 2 +- readme-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 57cd5bc..fd20ab5 100644 --- a/README.md +++ b/README.md @@ -247,7 +247,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions * **20.01.21:** - Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container). -* **16.01.21:** - Rebasing to alpine 3.13 +* **16.01.21:** - Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13). * **12.08.20:** - Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container). * **03.06.20:** - Rebasing to alpine 3.12 * **03.06.20:** - Add php7-bcmath and php7-fileinfo diff --git a/readme-vars.yml b/readme-vars.yml index be28557..46635a6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -76,7 +76,7 @@ app_setup_block: | # changelog changelogs: - { date: "20.01.21:", desc: "Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container)." } - - { date: "16.01.21:", desc: "Rebasing to alpine 3.13" } + - { date: "16.01.21:", desc: "Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13)." } - { date: "12.08.20:", desc: "Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container)." } - { date: "03.06.20:", desc: "Rebasing to alpine 3.12" } - { date: "03.06.20:", desc: "Add php7-bcmath and php7-fileinfo" }