From ff65a601c85e5a97cd8e1ba59c06c11d481abe4d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 9 Nov 2022 18:45:02 +0530 Subject: [PATCH 01/20] nextcloud 23.0.11 added --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d6abb495..134d4b6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:23.0.9-fpm AS nextcloud +FROM nextcloud:23.0.11-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.5" @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,9,1/23,0,9,19/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,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 0ccd197c32a1daaba7953dbc8446b1af118f511d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 9 Nov 2022 19:01:30 +0530 Subject: [PATCH 02/20] calendar job id updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 134d4b6d..69546e7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" -ARG CALENDAR_JOB_ID="414851" +ARG CALENDAR_JOB_ID="417988" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="389385" ARG RAINLOOP_VERSION="7.2.5" -- GitLab From efb240ff6ab1084d114ef8f791be6ff0dd01f3da Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 9 Nov 2022 20:09:23 +0530 Subject: [PATCH 03/20] updated job ids --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 69546e7b..d41e33cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,17 +3,17 @@ ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.5" ARG THEME_HELPER_VERSION="1.4.4" -ARG NEWS_VERSION="18.1.1" -ARG QUOTA_WARN_VERSION="1.14.0" +ARG NEWS_VERSION="19.0.0" +ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" ARG CALENDAR_JOB_ID="417988" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="389385" +ARG EMAIL_RECOVERY_JOB_ID="409877" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_TAG="2.1.1" -ARG ECLOUD_LAUNCHER_JOB_ID="389373" +ARG EA_TAG="2.2.1" +ARG ECLOUD_LAUNCHER_JOB_ID="400626" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -- GitLab From cad3ec012a989b9a4d7483be07917803da269f10 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 10 Nov 2022 15:36:02 +0530 Subject: [PATCH 04/20] Add sed to stop fix broken values repair step --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d41e33cf..9885daac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,11,1/23,0,11,1/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,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 @@ -168,6 +168,9 @@ RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_ #replace error class in schedule response error file to fix error color RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-error.php +# Remove 'fix broken values of calendar objects' repair step +RUN sed -i '/OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE_DIR}/apps/dav/appinfo/info.xml + # Custom theme RUN curl -fsSL -o eCloud-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ -- GitLab From 0ed7dbba2a1904c5dee3c5e43ae60cdb1137a467 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 10 Nov 2022 17:45:00 +0530 Subject: [PATCH 05/20] nextcloud 23 --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d41e33cf..d54554d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,19 @@ FROM nextcloud:23.0.11-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="22.1.5" -ARG THEME_HELPER_VERSION="1.4.4" +ARG THEME_VERSION="23.0.2" +ARG THEME_HELPER_VERSION="1.4.6" ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" -ARG CALENDAR_JOB_ID="417988" +ARG CALENDAR_JOB_ID="430631" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="409877" +ARG EMAIL_RECOVERY_JOB_ID="430623" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_TAG="2.2.1" -ARG ECLOUD_LAUNCHER_JOB_ID="400626" +ARG EA_TAG="2.3.0" +ARG ECLOUD_LAUNCHER_JOB_ID="430665" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -- GitLab From 8fc93f8b1120e51d57a98855cb237673fbd54e36 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 10 Nov 2022 17:47:31 +0530 Subject: [PATCH 06/20] version bump and job id update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 669c0d60..befc0913 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,11,1/23,0,11,2/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,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 07c3c44a46d4120004cf5528a9c9e76984c92e21 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 10 Nov 2022 17:50:29 +0530 Subject: [PATCH 07/20] version bump fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index befc0913..39372650 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,11,1/23,0,11,3' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,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 b9453bcc4bd99599aa92005c329307d77ec62cfd Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 11 Nov 2022 14:26:19 +0530 Subject: [PATCH 08/20] significant patch --- Dockerfile | 1 + patches/015-email-mail-template.patch | 52 ++++++++++----------------- patches/022-significantchange.patch | 11 ++++++ 3 files changed, 30 insertions(+), 34 deletions(-) create mode 100644 patches/022-significantchange.patch diff --git a/Dockerfile b/Dockerfile index 39372650..1f6cdf8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -136,6 +136,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}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.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 rm -rf ${TMP_PATCH_DIR} # show reset pwd page with a query param diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index f654c784..f709cf02 100644 --- a/patches/015-email-mail-template.patch +++ b/patches/015-email-mail-template.patch @@ -1,25 +1,9 @@ ---- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-10-26 11:45:19.589156800 +0530 -+++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-10-26 15:28:50.269156800 +0530 -@@ -151,15 +151,6 @@ - */ - public function schedule(Message $iTipMessage) { - -- // Not sending any emails if the system considers the update -- // insignificant. -- if (!$iTipMessage->significantChange) { -- if (!$iTipMessage->scheduleStatus) { -- $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email'; -- } -- return; -- } -- - $summary = $iTipMessage->message->VEVENT->SUMMARY; - - if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') { -@@ -252,7 +243,21 @@ - +--- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-11-10 10:39:19.134653000 +0530 ++++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-11-11 12:28:15.829119700 +0530 +@@ -252,7 +252,21 @@ + $summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event'); - + - $this->addSubjectAndHeading($template, $l10n, $method, $summary); + if ( count($vevent)>1) { + $this->addSubjectAndHeadingUpdated($template, $l10n, $method, $summary); @@ -37,17 +21,17 @@ + $template->addHeadingBanner('#EFFFDB','#293618',$l10n->t('This event has been updated, please review the information below:')); + } $this->addBulletList($template, $l10n, $vevent); - + // Only add response buttons to invitation requests: Fix Issue #11230 -@@ -516,6 +521,7 @@ +@@ -516,6 +530,7 @@ return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d'); } - + + /** * @param IEMailTemplate $template * @param IL10N $l10n -@@ -542,24 +548,86 @@ +@@ -542,24 +557,86 @@ /** * @param IEMailTemplate $template * @param IL10N $l10n @@ -89,7 +73,8 @@ + $lastmodified=$dtstampTime; + $selectedEvent = $currentevent; + } -+ } + } +- $meetingWhen = $this->generateWhenString($l10n, $vevent); + if ($selectedEvent->SUMMARY) { + if (trim($selectedEvent->SUMMARY) == trim($parentevent->SUMMARY)) { + $template->addBodyListItem($selectedEvent->SUMMARY, $l10n->t('Title:'), @@ -98,8 +83,7 @@ + $template->addBodyListItemModified($selectedEvent->SUMMARY, $l10n->t('Updated Title:'), + $this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT); + } - } -- $meetingWhen = $this->generateWhenString($l10n, $vevent); ++ } + $meetingWhen = $this->generateWhenString($l10n, $selectedEvent); if ($meetingWhen) { - $template->addBodyListItem($meetingWhen, $l10n->t('Time:'), @@ -145,7 +129,7 @@ $template->addBodyListItem(sprintf('%s', htmlspecialchars($url), htmlspecialchars($url)), -@@ -567,13 +635,16 @@ +@@ -567,13 +644,16 @@ $this->getAbsoluteImagePath('caldav/link.png'), $url,'',self::IMIP_INDENT); } @@ -167,17 +151,17 @@ + } } } - -@@ -662,7 +733,7 @@ + +@@ -662,7 +742,7 @@ Message $iTipMessage, $lastOccurrence) { $token = $this->createInvitationToken($iTipMessage, $lastOccurrence); - + - $template->addBodyButtonGroup( + $template->addBodyButtonGroupTentative( $l10n->t('Accept'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [ 'token' => $token, -@@ -670,18 +741,10 @@ +@@ -670,18 +750,10 @@ $l10n->t('Decline'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ 'token' => $token, @@ -197,5 +181,5 @@ - - $template->addBodyText($html, $text); } - + /** diff --git a/patches/022-significantchange.patch b/patches/022-significantchange.patch new file mode 100644 index 00000000..e7549ce8 --- /dev/null +++ b/patches/022-significantchange.patch @@ -0,0 +1,11 @@ +--- ./3rdparty/sabre/vobject/lib/ITip/Broker.php 2022-09-06 21:39:42.985827300 +0530 ++++ ./3rdparty/sabre/vobject/lib/ITip/Broker-New.php 2022-11-11 12:45:53.449119700 +0530 +@@ -75,6 +75,8 @@ + 'RDATE', + 'EXDATE', + 'STATUS', ++ 'SUMMARY', ++ 'DESCRIPTION', + ]; + + /** -- GitLab From 3258851cb344750247446a9becad30eb7b37f5f8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 11 Nov 2022 15:07:57 +0530 Subject: [PATCH 09/20] launcher old job id --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1f6cdf8d..8d78961d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG EMAIL_RECOVERY_JOB_ID="430623" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_TAG="2.3.0" -ARG ECLOUD_LAUNCHER_JOB_ID="430665" +ARG ECLOUD_LAUNCHER_JOB_ID="400677" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -- GitLab From 38f2c737525b61698973985f44cb914754f805e1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 14 Nov 2022 20:07:20 +0530 Subject: [PATCH 10/20] job id and app version updated --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d78961d..3ba1da04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,18 +2,18 @@ FROM nextcloud:23.0.11-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="23.0.2" -ARG THEME_HELPER_VERSION="1.4.6" +ARG THEME_HELPER_VERSION="1.5.0" ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" ARG CALENDAR_JOB_ID="430631" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="430623" +ARG EMAIL_RECOVERY_JOB_ID="433031" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_TAG="2.3.0" -ARG ECLOUD_LAUNCHER_JOB_ID="400677" +ARG EA_TAG="2.3.1" +ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -- GitLab From 5c282fec460fc94798c55765b0ea9bb9e0207fbe Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 14 Nov 2022 20:10:43 +0530 Subject: [PATCH 11/20] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3ba1da04..c047f41e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,11,1/23,0,11,3/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,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 51d2299a0d89cef5c7603c1425d1c599c7f0ce62 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 15 Nov 2022 12:57:05 +0530 Subject: [PATCH 12/20] job id for EA and Helper --- Dockerfile | 25 ++++++++++++------------- patches/015-email-mail-template.patch | 6 ++++++ patches/022-significantchange.patch | 8 +++++++- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index c047f41e..49b5fc01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM nextcloud:23.0.11-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="23.0.2" -ARG THEME_HELPER_VERSION="1.5.0" +ARG THEME_HELPER_JOB_ID="433007" ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" @@ -12,7 +12,7 @@ ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="433031" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_TAG="2.3.1" +ARG EA_JOB_ID="433023" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" @@ -72,12 +72,11 @@ RUN curl -fsSL -o rainloop.tar.gz \ 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.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-theme-helper/-/archive/${THEME_HELPER_VERSION}/ecloud-theme-helper-${THEME_HELPER_VERSION}.tar.gz" && \ - tar -xf ecloud-theme-helper.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - mv "${BASE_DIR}/custom_apps/ecloud-theme-helper-${THEME_HELPER_VERSION}" "${BASE_DIR}/custom_apps/ecloud-theme-helper" && \ - rm ecloud-theme-helper.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_VERSION_JOB_ID}/artifacts/download" && \ + unzip ecloud-theme-helper.zip && \ + mv dist/ecloud-theme-helper ${BASE_DIR}/custom_apps/ && \ + rm ecloud-theme-helper.zip; RUN curl -fsSL -o murena_launcher.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/launcher/-/jobs/${ECLOUD_LAUNCHER_JOB_ID}/artifacts/download" && \ @@ -91,11 +90,11 @@ RUN curl -fsSL -o integration_google.tar.gz \ chown -R www-data:www-data ${BASE_DIR}/custom_apps/integration_google && \ rm integration_google.tar.gz; -RUN curl -fsSL -o ecloud-accounts.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-accounts/-/archive/${EA_TAG}/ecloud-accounts-${EA_TAG}.tar.gz" && \ - tar -xf ecloud-accounts.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - mv "${BASE_DIR}/custom_apps/ecloud-accounts-${EA_TAG}" "${BASE_DIR}/custom_apps/ecloud-accounts" && \ - rm ecloud-accounts.tar.gz; +RUN curl -fsSL -o ecloud-accounts.zip \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-accounts/-/jobs/${EA_JOB_ID}/artifacts/download" && \ + unzip ecloud-accounts.zip && \ + mv dist/ecloud-accounts ${BASE_DIR}/custom_apps/ && \ + rm ecloud-accounts.zip; RUN curl -fsSL -o ldap_write_support.tar.gz \ "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \ diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index f709cf02..72af74d7 100644 --- a/patches/015-email-mail-template.patch +++ b/patches/015-email-mail-template.patch @@ -1,3 +1,9 @@ +From: Avinash +Date: Tue, 15 Nov 2022 12:50 +0530 +Subject: [PATCH] To implement custom email template design for calendar invite + +This patch is allowing to customize the email template design for invitation + --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-11-10 10:39:19.134653000 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-11-11 12:28:15.829119700 +0530 @@ -252,7 +252,21 @@ diff --git a/patches/022-significantchange.patch b/patches/022-significantchange.patch index e7549ce8..8040a53c 100644 --- a/patches/022-significantchange.patch +++ b/patches/022-significantchange.patch @@ -1,3 +1,9 @@ +From: Avinash +Date: Tue, 15 Nov 2022 12:50 +0530 +Subject: [PATCH] To allow significant change to send mail for summary and description change + +This patch is allowing to to send mail for summary and description change + --- ./3rdparty/sabre/vobject/lib/ITip/Broker.php 2022-09-06 21:39:42.985827300 +0530 +++ ./3rdparty/sabre/vobject/lib/ITip/Broker-New.php 2022-11-11 12:45:53.449119700 +0530 @@ -75,6 +75,8 @@ @@ -7,5 +13,5 @@ + 'SUMMARY', + 'DESCRIPTION', ]; - + /** -- GitLab From adeec4e4c05c0c0a710fa0731bbbeb2c8bc70fa5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 15 Nov 2022 13:01:49 +0530 Subject: [PATCH 13/20] text fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49b5fc01..ac3455d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,7 +73,7 @@ RUN curl -fsSL -o rainloop.tar.gz \ 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_VERSION_JOB_ID}/artifacts/download" && \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-theme-helper/-/jobs/${THEME_HELPER_JOB_ID}/artifacts/download" && \ unzip ecloud-theme-helper.zip && \ mv dist/ecloud-theme-helper ${BASE_DIR}/custom_apps/ && \ rm ecloud-theme-helper.zip; -- GitLab From 26b8f9ea7c1b146ad2f1d4b33db17952c507f050 Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 15 Nov 2022 19:05:56 +0530 Subject: [PATCH 14/20] add sed to fix notif icon src --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index ac3455d6..0ca0ee52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -144,6 +144,9 @@ RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1|| # hide oidc login button RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$context->registerAlternativeLogin(OIDCLoginOption::class);/' ${BASE_DIR}/custom_apps/oidc_login/lib/AppInfo/Application.php +# change notifications icon src +RUN sed -i "s/imagePath('notifications', iconPath)/'\/themes\/' + OC.theme.folder + '\/apps\/notifications\/img\/' + iconPath + '.svg'/" ${BASE_DIR}/apps/notifications/js/notifications-main.js + # sed version of ldap_write_support RUN cd ${BASE_DIR}/custom_apps/ldap_write_support && sed -i 's/max-version="22"/max-version="23"/' appinfo/info.xml -- GitLab From 4087f72d8fb88fe7232491ca0a68d59b086f0594 Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 15 Nov 2022 21:36:48 +0530 Subject: [PATCH 15/20] Get icon from theme --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0ca0ee52..877d0484 100644 --- a/Dockerfile +++ b/Dockerfile @@ -145,7 +145,7 @@ RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1|| RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$context->registerAlternativeLogin(OIDCLoginOption::class);/' ${BASE_DIR}/custom_apps/oidc_login/lib/AppInfo/Application.php # change notifications icon src -RUN sed -i "s/imagePath('notifications', iconPath)/'\/themes\/' + OC.theme.folder + '\/apps\/notifications\/img\/' + iconPath + '.svg'/" ${BASE_DIR}/apps/notifications/js/notifications-main.js +RUN sed -i 's/(0,Pd.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js # sed version of ldap_write_support RUN cd ${BASE_DIR}/custom_apps/ldap_write_support && sed -i 's/max-version="22"/max-version="23"/' appinfo/info.xml -- GitLab From b20b04bf943d76343856864ac23dab0c6ffbba4b Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 15 Nov 2022 21:37:01 +0530 Subject: [PATCH 16/20] Bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 877d0484..c90a2e99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,11,1/23,0,11,4/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,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 75bfc83875cc7342f574f0f964da83222cd8b9fb Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 16 Nov 2022 11:14:26 +0530 Subject: [PATCH 17/20] theme version updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c90a2e99..7a1291a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:23.0.11-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="23.0.2" +ARG THEME_VERSION="23.0.3" ARG THEME_HELPER_JOB_ID="433007" ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" -- GitLab From 3494101a0b5fb3e9bcb3dabf5a17d254c0b5a09b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 16 Nov 2022 11:15:56 +0530 Subject: [PATCH 18/20] theme helper jobid updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7a1291a0..3ac4bd84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM nextcloud:23.0.11-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="23.0.3" -ARG THEME_HELPER_JOB_ID="433007" +ARG THEME_HELPER_JOB_ID="433795" ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" -- GitLab From 61bc354be30c2861faa9c78b03200f464905b303 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 16 Nov 2022 11:16:33 +0530 Subject: [PATCH 19/20] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3ac4bd84..eb941fd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,11,1/23,0,11,5/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,6/' ${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 05cc3390654f424b18aeda16b3856f1432ad8b2e Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 16 Nov 2022 18:28:13 +0530 Subject: [PATCH 20/20] Update job ids --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb941fd2..e2050223 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,12 +7,12 @@ ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" -ARG CALENDAR_JOB_ID="430631" +ARG CALENDAR_JOB_ID="435164" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="433031" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_JOB_ID="433023" +ARG EA_JOB_ID="433303" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -- GitLab