Skip to content
Snippets Groups Projects
Commit 4da1973e authored by Timothee Gosselin's avatar Timothee Gosselin
Browse files

Merge branch 'feature-fix-oo' into 'master'

fix: oo cron

See merge request !30
parents 05c7b82a 53ee94fb
No related branches found
No related tags found
1 merge request!30fix: oo cron
Pipeline #1841 failed with stages
in 7 minutes and 45 seconds
......@@ -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
......
# 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 @@
<commands>
<command>OCA\Onlyoffice\Command\DocumentServer</command>
</commands>
- <background-jobs>
- <job>OCA\Onlyoffice\Cron\EditorsCheck</job>
- </background-jobs>
</info>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment