From 6be9c0a950f14d0e9fbc5fced84d1463f0dd1bbd Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Mon, 9 Oct 2023 16:26:01 +0200 Subject: [PATCH 1/9] fix: oo cron --- base/patches/fix-oo.diff | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 base/patches/fix-oo.diff diff --git a/base/patches/fix-oo.diff b/base/patches/fix-oo.diff new file mode 100644 index 0000000..e30b3ad --- /dev/null +++ b/base/patches/fix-oo.diff @@ -0,0 +1,14 @@ +# Waiting a new relaease of OO:https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/864 +diff --git a/apps/onlyoffice/lib/appconfig.php b/apps/onlyoffice/lib/appconfig.php +index 06f9fbb..7f9c1cc 100644 +--- a/apps/onlyoffice/lib/appconfig.php ++++ b/apps/onlyoffice/lib/appconfig.php +@@ -1290,7 +1290,7 @@ class AppConfig { + public function GetEditorsCheckInterval() { + $interval = $this->GetSystemValue($this->_editors_check_interval); + +- if (empty($interval) && $interval !== 0) { ++ if (empty($interval)) { + $interval = 60*60*24; + } + return (integer)$interval; -- GitLab From f5e6c37ba56e5c450392695b297e9048ac811f34 Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Mon, 9 Oct 2023 16:54:42 +0200 Subject: [PATCH 2/9] feat: apply patches on apps as well --- base/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index ebcd447..8f21b55 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -26,11 +26,6 @@ COPY ./img/favicon.ico /usr/src/nextcloud/core/img/favicon.ico COPY install.sh /install.sh COPY refresh_config.sh /refresh_config.sh COPY patches /usr/src/nextcloud/patches -RUN for patch in /usr/src/nextcloud/patches/*.diff; \ - do \ - patch -p0 < $patch; \ - done; \ - rm -r /usr/src/nextcloud/patches/; RUN for app in $(cat /usr/src/nextcloud/apps/remove-list);do \ echo "removing app $app"; \ rm -R /usr/src/nextcloud/apps/$app; \ @@ -40,6 +35,11 @@ RUN for app in $(cat /usr/src/nextcloud/apps/remove-list);do \ rm /usr/src/nextcloud/apps/remove-list; \ rm -rf custom_apps/; \ rm /usr/src/nextcloud/config/autoconfig.php /usr/src/nextcloud/config/config.sample.php; +RUN for patch in /usr/src/nextcloud/patches/*.diff; \ + do \ + patch -p0 < $patch; \ + done; \ + rm -r /usr/src/nextcloud/patches/; RUN apk add --no-cache fcgi COPY php-fpm-healthcheck /php-fpm-healthcheck -- GitLab From d1d1eba058838669b85de2a3a714652c90619f89 Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Mon, 9 Oct 2023 17:21:56 +0200 Subject: [PATCH 3/9] fix: patch in the wrong direction --- base/patches/fix-oo.diff | 4 ++-- ci/functions | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/base/patches/fix-oo.diff b/base/patches/fix-oo.diff index e30b3ad..8233715 100644 --- a/base/patches/fix-oo.diff +++ b/base/patches/fix-oo.diff @@ -7,8 +7,8 @@ index 06f9fbb..7f9c1cc 100644 public function GetEditorsCheckInterval() { $interval = $this->GetSystemValue($this->_editors_check_interval); -- if (empty($interval) && $interval !== 0) { -+ if (empty($interval)) { +- if (empty($interval)) { ++ if (empty($interval) && $interval !== 0) { $interval = 60*60*24; } return (integer)$interval; diff --git a/ci/functions b/ci/functions index 1b2e777..4582c1a 100644 --- a/ci/functions +++ b/ci/functions @@ -44,7 +44,6 @@ function test_build() { function build() { print_versions - cp $DOCKER_SECRET_CONFIG /kaniko/.docker/config.json export DESTINATION_PREFIX="--destination ${DOCKER_HUB_REPO}" export DATE=`date "+%Y-%m-%dT%H-%M-%SZ"` -- GitLab From d718f0d7bf392c89d96747a76b0759c8f26b5847 Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Mon, 9 Oct 2023 17:26:24 +0200 Subject: [PATCH 4/9] fix: ... --- ci/functions | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/functions b/ci/functions index 4582c1a..1b2e777 100644 --- a/ci/functions +++ b/ci/functions @@ -44,6 +44,7 @@ function test_build() { function build() { print_versions + cp $DOCKER_SECRET_CONFIG /kaniko/.docker/config.json export DESTINATION_PREFIX="--destination ${DOCKER_HUB_REPO}" export DATE=`date "+%Y-%m-%dT%H-%M-%SZ"` -- GitLab From 159453284e28f3cca118ca1ba8c250a84dd6655a Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Mon, 9 Oct 2023 20:07:57 +0000 Subject: [PATCH 5/9] ff --- base/patches/fix-oo.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/patches/fix-oo.diff b/base/patches/fix-oo.diff index 8233715..1b9df03 100644 --- a/base/patches/fix-oo.diff +++ b/base/patches/fix-oo.diff @@ -1,8 +1,8 @@ # Waiting a new relaease of OO:https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/864 diff --git a/apps/onlyoffice/lib/appconfig.php b/apps/onlyoffice/lib/appconfig.php index 06f9fbb..7f9c1cc 100644 ---- a/apps/onlyoffice/lib/appconfig.php -+++ b/apps/onlyoffice/lib/appconfig.php +--- ./apps/onlyoffice/lib/appconfig.php ++++ ../appconfig.php @@ -1290,7 +1290,7 @@ class AppConfig { public function GetEditorsCheckInterval() { $interval = $this->GetSystemValue($this->_editors_check_interval); -- GitLab From 61e07957e655d00332642b5023b6450903671c08 Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Thu, 12 Oct 2023 11:32:26 +0200 Subject: [PATCH 6/9] fix: remove background job altogether --- base/patches/fix-oo.diff | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/base/patches/fix-oo.diff b/base/patches/fix-oo.diff index 1b9df03..4841ff8 100644 --- a/base/patches/fix-oo.diff +++ b/base/patches/fix-oo.diff @@ -1,14 +1,13 @@ # Waiting a new relaease of OO:https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/864 -diff --git a/apps/onlyoffice/lib/appconfig.php b/apps/onlyoffice/lib/appconfig.php -index 06f9fbb..7f9c1cc 100644 ---- ./apps/onlyoffice/lib/appconfig.php -+++ ../appconfig.php -@@ -1290,7 +1290,7 @@ class AppConfig { - public function GetEditorsCheckInterval() { - $interval = $this->GetSystemValue($this->_editors_check_interval); - -- if (empty($interval)) { -+ if (empty($interval) && $interval !== 0) { - $interval = 60*60*24; - } - return (integer)$interval; +diff --git a/apps/onlyoffice/appinfo/info.xml b/apps/onlyoffice/appinfo/info.xml +index ff5282f..83535e9 100644 +--- ./apps/onlyoffice/lib/appinfo/info.xml ++++ ../info.xml +@@ -39,7 +39,4 @@ + + OCA\Onlyoffice\Command\DocumentServer + +- +- OCA\Onlyoffice\Cron\EditorsCheck +- + -- GitLab From 1f51df081a98393c5102d34fdd6b96f43388f98a Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Thu, 12 Oct 2023 11:38:34 +0200 Subject: [PATCH 7/9] fix: remove Cron file as well --- base/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/Dockerfile b/base/Dockerfile index 8f21b55..73b8614 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -41,6 +41,10 @@ RUN for patch in /usr/src/nextcloud/patches/*.diff; \ done; \ rm -r /usr/src/nextcloud/patches/; +# Waiting a new relaease of OO:https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/864 +RUN rm -rf /usr/src/nextcloud/apps/onlyoffice/lib/Cron + + RUN apk add --no-cache fcgi COPY php-fpm-healthcheck /php-fpm-healthcheck -- GitLab From 24bf0ba17e30acaa96efbfd0442123f9c9d8fa10 Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Thu, 12 Oct 2023 11:45:24 +0200 Subject: [PATCH 8/9] fix: ... --- base/patches/fix-oo.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/patches/fix-oo.diff b/base/patches/fix-oo.diff index 4841ff8..72448ec 100644 --- a/base/patches/fix-oo.diff +++ b/base/patches/fix-oo.diff @@ -1,7 +1,7 @@ # Waiting a new relaease of OO:https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/864 diff --git a/apps/onlyoffice/appinfo/info.xml b/apps/onlyoffice/appinfo/info.xml index ff5282f..83535e9 100644 ---- ./apps/onlyoffice/lib/appinfo/info.xml +--- ./apps/onlyoffice/appinfo/info.xml +++ ../info.xml @@ -39,7 +39,4 @@ -- GitLab From 30c95aeeb9d61f0c29b117225c6e4f1034bd7717 Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Thu, 12 Oct 2023 14:41:04 +0200 Subject: [PATCH 9/9] fix: typo --- base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/Dockerfile b/base/Dockerfile index 73b8614..4673e5b 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -42,7 +42,7 @@ RUN for patch in /usr/src/nextcloud/patches/*.diff; \ rm -r /usr/src/nextcloud/patches/; # Waiting a new relaease of OO:https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/864 -RUN rm -rf /usr/src/nextcloud/apps/onlyoffice/lib/Cron +RUN rm -rf /usr/src/nextcloud/apps/onlyoffice/lib/cron RUN apk add --no-cache fcgi -- GitLab