Skip to content
GitLab
Explore
Sign in
Commits on Source (2)
fix(oo): onlyoffice cron check
· 53ee94fb
Pierre Ozoux
authored
Oct 30, 2023
and
Timothee Gosselin
committed
Oct 30, 2023
53ee94fb
Merge branch 'feature-fix-oo' into 'master'
· 4da1973e
Timothee Gosselin
authored
Oct 30, 2023
fix: oo cron See merge request
!30
4da1973e
Hide whitespace changes
Inline
Side-by-side
base/Dockerfile
View file @
4da1973e
...
@@ -26,11 +26,6 @@ COPY ./img/favicon.ico /usr/src/nextcloud/core/img/favicon.ico
...
@@ -26,11 +26,6 @@ COPY ./img/favicon.ico /usr/src/nextcloud/core/img/favicon.ico
COPY
install.sh /install.sh
COPY
install.sh /install.sh
COPY
refresh_config.sh /refresh_config.sh
COPY
refresh_config.sh /refresh_config.sh
COPY
patches /usr/src/nextcloud/patches
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
\
RUN for
app
in
$(
cat
/usr/src/nextcloud/apps/remove-list
)
;
do
\
echo
"removing app
$app
"
;
\
echo
"removing app
$app
"
;
\
rm
-R
/usr/src/nextcloud/apps/
$app
;
\
rm
-R
/usr/src/nextcloud/apps/
$app
;
\
...
@@ -40,6 +35,15 @@ RUN for app in $(cat /usr/src/nextcloud/apps/remove-list);do \
...
@@ -40,6 +35,15 @@ RUN for app in $(cat /usr/src/nextcloud/apps/remove-list);do \
rm
/usr/src/nextcloud/apps/remove-list
;
\
rm
/usr/src/nextcloud/apps/remove-list
;
\
rm
-rf
custom_apps/
;
\
rm
-rf
custom_apps/
;
\
rm
/usr/src/nextcloud/config/autoconfig.php /usr/src/nextcloud/config/config.sample.php
;
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
RUN
apk add
--no-cache
fcgi
COPY
php-fpm-healthcheck /php-fpm-healthcheck
COPY
php-fpm-healthcheck /php-fpm-healthcheck
...
...
base/patches/fix-oo.diff
0 → 100644
View file @
4da1973e
# 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>