From 31872211f10563d461602c61f816f54ea6dc6f36 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 28 Feb 2023 07:06:07 +0530 Subject: [PATCH 01/19] nextcloud 24-0-10 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 64a024e4..7b3ef0d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:24.0.8-fpm AS nextcloud +FROM nextcloud:24.0.10-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="446245" @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="458901" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/24,0,8,2/24,0,8,7/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,10,1/24,0,10,1/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab From 84377a5025152c02e71162ba4dcbe7e2b6ccdad1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 28 Feb 2023 07:24:26 +0530 Subject: [PATCH 02/19] update job ids --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b3ef0d9..f66c7ccb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ FROM nextcloud:24.0.10-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="446245" -ARG NEWS_VERSION="20.0.0" +ARG THEME_HELPER_JOB_ID="515506" +ARG NEWS_VERSION="20.0.1" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" -ARG CONTACTS_JOB_ID="471108" -ARG CALENDAR_JOB_ID="471116" +ARG CONTACTS_JOB_ID="519811" +ARG CALENDAR_JOB_ID="520240" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="445958" +ARG EMAIL_RECOVERY_JOB_ID="500955" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_JOB_ID="445966" -ARG ECLOUD_LAUNCHER_JOB_ID="458901" +ARG EA_JOB_ID="503352" +ARG ECLOUD_LAUNCHER_JOB_ID="472667" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -- GitLab From f273218bc0bb50ec2865f92392eaa4255f68ea76 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 28 Feb 2023 07:32:02 +0530 Subject: [PATCH 03/19] update job ids --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f66c7ccb..80d2c5d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG EMAIL_RECOVERY_JOB_ID="500955" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_JOB_ID="503352" -ARG ECLOUD_LAUNCHER_JOB_ID="472667" +ARG ECLOUD_LAUNCHER_JOB_ID="520170" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -- GitLab From 6779847d6097a58a879ff746e91e5d2f032dcac0 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 28 Feb 2023 08:14:44 +0530 Subject: [PATCH 04/19] theme update to 24.0.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 80d2c5d4..091401de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -155,7 +155,7 @@ RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-e From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="24.0.1" +ARG THEME_VERSION="24.0.2" ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0" ARG OIDC_LOGIN_VERSION="2.4.0" -- GitLab From d34e6e915c4a157d51be7104c10ecb464777b0ab Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 28 Feb 2023 12:40:55 +0530 Subject: [PATCH 05/19] ecloud account --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 091401de..e668e1c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="500955" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_JOB_ID="503352" +ARG EA_JOB_ID="516635" ARG ECLOUD_LAUNCHER_JOB_ID="520170" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -- GitLab From b07f7ba844b97093bd674ce075a3af7df4457c64 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 28 Feb 2023 15:03:26 +0530 Subject: [PATCH 06/19] removed rainloop --- Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index e668e1c3..c3a54939 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,6 @@ ARG CONTACTS_JOB_ID="519811" ARG CALENDAR_JOB_ID="520240" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="500955" -ARG RAINLOOP_VERSION="7.2.5" -ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_JOB_ID="516635" ARG ECLOUD_LAUNCHER_JOB_ID="520170" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" @@ -64,11 +62,6 @@ RUN curl -fsSL -o email-recovery.zip \ mv dist/email-recovery ${BASE_DIR}/custom_apps/ && \ rm email-recovery.zip; -RUN curl -fsSL -o rainloop.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}.tar.gz" && \ - tar -xf rainloop.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - mv "${BASE_DIR}/custom_apps/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}" "${BASE_DIR}/custom_apps/rainloop" && \ - rm rainloop.tar.gz; RUN curl -fsSL -o ecloud-theme-helper.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-theme-helper/-/jobs/${THEME_HELPER_JOB_ID}/artifacts/download" && \ -- GitLab From 0ba4ca8295160c6c68962740b6f326a28d9d9f88 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 1 Mar 2023 11:26:27 +0530 Subject: [PATCH 07/19] job id updates --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3a54939..7198582f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,9 @@ ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="519811" ARG CALENDAR_JOB_ID="520240" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="500955" -ARG EA_JOB_ID="516635" -ARG ECLOUD_LAUNCHER_JOB_ID="520170" +ARG EMAIL_RECOVERY_JOB_ID="445958" +ARG EA_JOB_ID="503352" +ARG ECLOUD_LAUNCHER_JOB_ID="489475" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -- GitLab From fd0ae18cb715937e86bbacfb0ea77db4a6f363af Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 3 Mar 2023 17:19:02 +0530 Subject: [PATCH 08/19] snappy mail added --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index 94922c39..859d5656 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,8 @@ ARG EA_JOB_ID="503352" ARG ECLOUD_LAUNCHER_JOB_ID="489475" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" +ARG SNAPPY_VERSION="2.26.3" + RUN sed -i 's/24,0,10,1/24,0,10,1/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / @@ -76,6 +78,11 @@ RUN curl -fsSL -o ecloud-dashboard.zip \ mv dist/ecloud-dashboard ${BASE_DIR}/custom_apps/ && \ rm ecloud-dashboard.zip; +RUN curl -fsSL -o snappymail.tar.gz \ + "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \ + tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + rm snappymail.tar.gz; + # Remove unzip when unzipping is done RUN apt-get -y remove unzip -- GitLab From 912c6f75878ecb04dc8dc9c0772324a7f9710640 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 3 Mar 2023 17:31:05 +0530 Subject: [PATCH 09/19] ecloud dashboard job id updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 859d5656..6e097bd6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG EMAIL_RECOVERY_JOB_ID="445958" ARG EA_JOB_ID="503352" ARG ECLOUD_LAUNCHER_JOB_ID="489475" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -ARG ECLOUD_DASHBOARD_JOB_ID="485170" +ARG ECLOUD_DASHBOARD_JOB_ID="524349" ARG SNAPPY_VERSION="2.26.3" -- GitLab From b9616b2b2efb639d6ece89df53918b6b701a4fa4 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 6 Mar 2023 10:18:34 +0530 Subject: [PATCH 10/19] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6e097bd6..27d7cd88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="524349" ARG SNAPPY_VERSION="2.26.3" -RUN sed -i 's/24,0,10,1/24,0,10,1/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,10,1/24,0,10,2/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab From 9aee5cf88b00a5b90f876bf23fb1f3a1176f1490 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 6 Mar 2023 13:53:20 +0530 Subject: [PATCH 11/19] app job id and version updates --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 27d7cd88..a2b4260f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,17 +2,17 @@ FROM nextcloud:24.0.10-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="515506" -ARG NEWS_VERSION="20.0.1" +ARG NEWS_VERSION="21.0.0" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" -ARG CONTACTS_JOB_ID="519811" -ARG CALENDAR_JOB_ID="520240" +ARG CONTACTS_JOB_ID="525457" +ARG CALENDAR_JOB_ID="525449" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="445958" +ARG EMAIL_RECOVERY_JOB_ID="525467" ARG EA_JOB_ID="503352" -ARG ECLOUD_LAUNCHER_JOB_ID="489475" +ARG ECLOUD_LAUNCHER_JOB_ID="522867" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -ARG ECLOUD_DASHBOARD_JOB_ID="524349" +ARG ECLOUD_DASHBOARD_JOB_ID="524334" ARG SNAPPY_VERSION="2.26.3" @@ -145,7 +145,7 @@ RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-e From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="24.0.2" +ARG THEME_VERSION="24.0.3" ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0" ARG OIDC_LOGIN_VERSION="2.4.0" -- GitLab From 39ea4cb081e2c2027880d64f755a7e1b5a30f19c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 6 Mar 2023 14:10:16 +0530 Subject: [PATCH 12/19] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a2b4260f..712ab041 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="524334" ARG SNAPPY_VERSION="2.26.3" -RUN sed -i 's/24,0,10,1/24,0,10,2/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,10,1/24,0,10,3/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab From ff54848bdf33f6badbbe1cb06cf230a895cc5dd6 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 6 Mar 2023 14:46:58 +0530 Subject: [PATCH 13/19] ecloud dashboard job id include dark theme --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 712ab041..547bd2cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG EMAIL_RECOVERY_JOB_ID="525467" ARG EA_JOB_ID="503352" ARG ECLOUD_LAUNCHER_JOB_ID="522867" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -ARG ECLOUD_DASHBOARD_JOB_ID="524334" +ARG ECLOUD_DASHBOARD_JOB_ID="525503" ARG SNAPPY_VERSION="2.26.3" -- GitLab From f585c2f6d2fc9c5fb94b414d123410df519af481 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 6 Mar 2023 17:22:14 +0530 Subject: [PATCH 14/19] removed news --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 547bd2cf..7bfd7499 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,9 @@ FROM nextcloud:24.0.10-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="515506" -ARG NEWS_VERSION="21.0.0" -ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="525457" ARG CALENDAR_JOB_ID="525449" -ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="525467" ARG EA_JOB_ID="503352" ARG ECLOUD_LAUNCHER_JOB_ID="522867" -- GitLab From ff917fa1fc4c0bb6abad62170d7f4730d3bc2c15 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 6 Mar 2023 17:38:10 +0530 Subject: [PATCH 15/19] update google integration and version bump --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7bfd7499..47fb085c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,12 +8,12 @@ ARG CALENDAR_JOB_ID="525449" ARG EMAIL_RECOVERY_JOB_ID="525467" ARG EA_JOB_ID="503352" ARG ECLOUD_LAUNCHER_JOB_ID="522867" -ARG GOOGLE_INTEGRATION_VERSION="1.0.8" +ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG ECLOUD_DASHBOARD_JOB_ID="525503" ARG SNAPPY_VERSION="2.26.3" -RUN sed -i 's/24,0,10,1/24,0,10,3/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,10,1/24,0,10,4/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab From 6aeb47f1e81fe0d7fc09283381b943f883a8a80b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 6 Mar 2023 21:21:16 +0530 Subject: [PATCH 16/19] reminder service patch --- Dockerfile | 2 ++ ...024-eminder-service-handle-exception.patch | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 patches/024-eminder-service-handle-exception.patch diff --git a/Dockerfile b/Dockerfile index 47fb085c..113a3fe4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,6 +112,8 @@ RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-o RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch +RUN patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-eminder-service-handle-exception.patch + RUN rm -rf ${TMP_PATCH_DIR} # Custom theme diff --git a/patches/024-eminder-service-handle-exception.patch b/patches/024-eminder-service-handle-exception.patch new file mode 100644 index 00000000..f126eb5b --- /dev/null +++ b/patches/024-eminder-service-handle-exception.patch @@ -0,0 +1,20 @@ +--- ReminderService.php 2023-02-27 12:55:01.245349485 +0530 ++++ ReminderService-new.php 2023-02-27 15:58:02.515774882 +0530 +@@ -143,7 +143,15 @@ + continue; + } + +- $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']); ++ ++ try { ++ $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']); ++ } catch (MaxInstancesExceededException $e) { ++ $this->logger->debug('Recurrence with too many instances detected, skipping VEVENT', ['exception' => $e]); ++ $this->backend->removeReminder($reminder['id']); ++ continue; ++ } ++ + if (!$vevent) { + $this->backend->removeReminder($reminder['id']); + continue; + -- GitLab From a8266c076ae899633c298012feeeeeb1669685c4 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 6 Mar 2023 21:35:41 +0530 Subject: [PATCH 17/19] patch fix --- ...024-eminder-service-handle-exception.patch | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/patches/024-eminder-service-handle-exception.patch b/patches/024-eminder-service-handle-exception.patch index f126eb5b..ed5c276d 100644 --- a/patches/024-eminder-service-handle-exception.patch +++ b/patches/024-eminder-service-handle-exception.patch @@ -1,20 +1,17 @@ ---- ReminderService.php 2023-02-27 12:55:01.245349485 +0530 -+++ ReminderService-new.php 2023-02-27 15:58:02.515774882 +0530 -@@ -143,7 +143,15 @@ - continue; - } - -- $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']); -+ -+ try { -+ $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']); -+ } catch (MaxInstancesExceededException $e) { -+ $this->logger->debug('Recurrence with too many instances detected, skipping VEVENT', ['exception' => $e]); -+ $this->backend->removeReminder($reminder['id']); -+ continue; -+ } -+ - if (!$vevent) { - $this->backend->removeReminder($reminder['id']); - continue; +--- ./apps/dav/lib/CalDAV/Reminder/ReminderService.php 2023-03-06 21:26:20.835422901 +0530 ++++ ./apps/dav/lib/CalDAV/Reminder/ReminderService-new.php 2023-03-06 21:28:49.325422185 +0530 +@@ -143,7 +143,13 @@ + continue; + } +- $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']); ++ try { ++ $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']); ++ } catch (MaxInstancesExceededException $e) { ++ $this->logger->debug('Recurrence with too many instances detected, skipping VEVENT', ['exception' => $e]); ++ $this->backend->removeReminder($reminder['id']); ++ continue; ++ } + if (!$vevent) { + $this->backend->removeReminder($reminder['id']); + continue; -- GitLab From b280bfeecf233bcdf15c73a80d155dd301e5542b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 6 Mar 2023 21:38:57 +0530 Subject: [PATCH 18/19] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 113a3fe4..e510bb19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="525503" ARG SNAPPY_VERSION="2.26.3" -RUN sed -i 's/24,0,10,1/24,0,10,4/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,10,1/24,0,10,5/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab From f2cde594368ebdc312917944a81d510ca18ad750 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 6 Mar 2023 22:12:30 +0530 Subject: [PATCH 19/19] typo correction and version bump --- Dockerfile | 2 +- ...eption.patch => 024-reminder-service-handle-exception.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename patches/{024-eminder-service-handle-exception.patch => 024-reminder-service-handle-exception.patch} (100%) diff --git a/Dockerfile b/Dockerfile index e510bb19..418dbe92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,7 +112,7 @@ RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-o RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch -RUN patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-eminder-service-handle-exception.patch +RUN patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-reminder-service-handle-exception.patch RUN rm -rf ${TMP_PATCH_DIR} diff --git a/patches/024-eminder-service-handle-exception.patch b/patches/024-reminder-service-handle-exception.patch similarity index 100% rename from patches/024-eminder-service-handle-exception.patch rename to patches/024-reminder-service-handle-exception.patch -- GitLab