diff --git a/base/Dockerfile b/base/Dockerfile index ebcd447badbbd08b24a64bfb057f63327b6072c0..4673e5bbf8786fbeb907b75c6b9f27655043a6d8 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,15 @@ 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/; + +# 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 diff --git a/base/patches/fix-oo.diff b/base/patches/fix-oo.diff new file mode 100644 index 0000000000000000000000000000000000000000..72448ecdb6d2de4c024ffb043d5cfe090ec80cbd --- /dev/null +++ b/base/patches/fix-oo.diff @@ -0,0 +1,13 @@ +# 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/appinfo/info.xml ++++ ../info.xml +@@ -39,7 +39,4 @@ + + OCA\Onlyoffice\Command\DocumentServer + +- +- OCA\Onlyoffice\Cron\EditorsCheck +- +