From 22de6578b470c28a635b46af880de0fdd45bfff1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 6 Sep 2022 18:42:07 +0530 Subject: [PATCH 01/32] nextcloud 23 update --- Dockerfile | 2 +- patches/015-email-mail-template.patch | 123 ++++++++------------------ 2 files changed, 38 insertions(+), 87 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7fe695e4..ced00ae7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:22.2.10-fpm AS nextcloud +FROM nextcloud:23.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.4" diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index d6281ed1..12109ab9 100644 --- a/patches/015-email-mail-template.patch +++ b/patches/015-email-mail-template.patch @@ -1,39 +1,5 @@ ---- apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-04-27 09:57:34.955523100 +0530 -+++ apps/dav/lib/CalDAV/Schedule/IMipPlugin_Modifiednew.php 2022-04-27 09:57:09.345523100 +0530 -@@ -659,7 +659,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, -@@ -667,18 +667,11 @@ - $l10n->t('Decline'), - $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ - 'token' => $token, -- ]) -+ ]), -+ $l10n->t('Maybe'), -+ $this->urlGenerator->getAbsoluteUrl('apps/calendar/invitation/tentative/'.$token) - ); - -- $moreOptionsURL = $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.options', [ -- 'token' => $token, -- ]); -- $html = vsprintf('%s', [ -- $moreOptionsURL, $l10n->t('More options …') -- ]); -- $text = $l10n->t('More options at %s', [$moreOptionsURL]); -- -- $template->addBodyText($html, $text); - } - - /** - ---- apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-07-27 13:21:50.294113800 +0530 -+++ apps/dav/lib/CalDAV/Schedule/IMipPlugin-New.php 2022-08-16 16:29:16.531866700 +0530 +--- apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-09-06 17:56:20.875827300 +0530 ++++ apps/dav/lib/CalDAV/Schedule/IMipPlugin-new23.php 2022-09-06 17:13:51.925827300 +0530 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { @@ -50,7 +16,7 @@ $summary = $iTipMessage->message->VEVENT->SUMMARY; if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') { -@@ -252,9 +243,25 @@ +@@ -252,7 +243,22 @@ $summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event'); @@ -73,43 +39,11 @@ + } $this->addBulletList($template, $l10n, $vevent); -+ // Only add response buttons to invitation requests: Fix Issue #11230 - if (($method == self::METHOD_REQUEST) && $this->getAttendeeRsvpOrReqForParticipant($attendee)) { - -@@ -414,7 +421,7 @@ - return false; - } - -- /** -+ /** +@@ -542,24 +548,84 @@ + /** + * @param IEMailTemplate $template * @param IL10N $l10n - * @param VEvent $vevent - */ -@@ -525,38 +532,99 @@ - private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n, - $method, $summary) { - if ($method === self::METHOD_CANCEL) { -- $template->setSubject('Canceled: ' . $summary); -+ //TRANSLATORS Subject for email, when an invitation is cancelled. Ex: "Cancelled: {{Event Name}}" -+ $template->setSubject($l10n->t('Cancelled: %1$s', [$summary])); - $template->addHeading($l10n->t('Invitation canceled')); - } elseif ($method === self::METHOD_REPLY) { -- $template->setSubject('Re: ' . $summary); -+ // TRANSLATORS Subject for email, when an invitation is updated. Ex: "Re: {{Event Name}}" -+ $template->setSubject($l10n->t('Re: %1$s', [$summary])); - $template->addHeading($l10n->t('Invitation updated')); - } else { -- $template->setSubject('Invitation: ' . $summary); -+ // TRANSLATORS Subject for email, when an invitation is sent. Ex: "Invitation: {{Event Name}}" -+ $template->setSubject($l10n->t('Invitation: %1$s', [$summary])); - $template->addHeading($l10n->t('Invitation')); - } - } -- -+ /** -+ * @param IEMailTemplate $template -+ * @param IL10N $l10n + * @param string $method + * @param string $summary + */ @@ -129,9 +63,10 @@ + $template->addHeading($l10n->t('Invitation Update')); + } + } - /** - * @param IEMailTemplate $template - * @param IL10N $l10n ++ ++ /** ++ * @param IEMailTemplate $template ++ * @param IL10N $l10n * @param VEVENT $vevent */ private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) { @@ -201,7 +136,7 @@ $template->addBodyListItem(sprintf('%s', htmlspecialchars($url), htmlspecialchars($url)), -@@ -565,12 +633,18 @@ +@@ -568,12 +634,18 @@ $url,'',self::IMIP_INDENT); } @@ -224,18 +159,34 @@ } } -@@ -671,7 +745,6 @@ - $l10n->t('Maybe'), - $this->urlGenerator->getAbsoluteUrl('apps/calendar/invitation/tentative/'.$token) +@@ -662,7 +734,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 +742,10 @@ + $l10n->t('Decline'), + $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ + 'token' => $token, +- ]) ++ ]), ++ $l10n->t('Maybe'), ++ $this->urlGenerator->getAbsoluteUrl('apps/calendar/invitation/tentative/'.$token) ); - +- $moreOptionsURL = $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.options', [ +- 'token' => $token, +- ]); +- $html = vsprintf('%s', [ +- $moreOptionsURL, $l10n->t('More options …') +- ]); +- $text = $l10n->t('More options at %s', [$moreOptionsURL]); +- +- $template->addBodyText($html, $text); } /** -@@ -716,4 +789,4 @@ - - return $token; - } --} -+} -\ No newline at end of file -- GitLab From 2c433e8fbf8305064afe38944321f90d784b0e2a Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 7 Sep 2022 16:04:30 +0530 Subject: [PATCH 02/32] version fix for nextcloud and ecloud theme helper --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ced00ae7..5bbffe65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM nextcloud:23.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.4" -ARG THEME_HELPER_VERSION="1.4.1" +ARG THEME_HELPER_VERSION="dev-version-fix-23" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.0" @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,10,2/22,2,10,5/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,8,1/22,0,8,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 6e6345d6dd455d29cd797629660b31a0dfed7c2c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 7 Sep 2022 16:28:02 +0530 Subject: [PATCH 03/32] version fix for nextcloud --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5bbffe65..9f5619a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM nextcloud:23.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.4" -ARG THEME_HELPER_VERSION="dev-version-fix-23" +ARG THEME_HELPER_VERSION="version-fix-23" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.0" -- GitLab From 34377ecfd4844a3623c00e47d766dcd852097c62 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 7 Sep 2022 17:27:27 +0530 Subject: [PATCH 04/32] version fix --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f5619a8..ff3440aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,11 +9,11 @@ ARG NOTES_VERSION="4.5.0" ARG CONTACTS_JOB_ID="372144" ARG CALENDAR_JOB_ID="372097" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="314819" +ARG EMAIL_RECOVERY_JOB_ID="381352" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_TAG="2.1.0" -ARG ECLOUD_LAUNCHER_JOB_ID="345049" +ARG EA_TAG="test-version-update-23" +ARG ECLOUD_LAUNCHER_JOB_ID="381361" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -- GitLab From 3186cd3d23b7c5713b23e88124e613db86798f14 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 7 Sep 2022 18:03:25 +0530 Subject: [PATCH 05/32] version fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ff3440aa..45c8cb0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="381361" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/23,0,8,1/22,0,8,1/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,8,1/23,0,8,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 ea87ec1d8f7c7276db5ea99bb4e34fc045a6dd8b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 7 Sep 2022 19:13:37 +0530 Subject: [PATCH 06/32] patch -u added --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 45c8cb0c..688a4e44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -124,7 +124,7 @@ RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/014-add-mail-usage.patch -RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch +RUN cd ${BASE_DIR} && patch -u < ${TMP_PATCH_DIR}/015-email-mail-template.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN rm -rf ${TMP_PATCH_DIR} -- GitLab From 265fbd0215b64592c24436c04c6cdc3a246a1cc1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 7 Sep 2022 19:19:56 +0530 Subject: [PATCH 07/32] patch -u added --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 688a4e44..e0e9e1f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -124,7 +124,7 @@ RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/014-add-mail-usage.patch -RUN cd ${BASE_DIR} && patch -u < ${TMP_PATCH_DIR}/015-email-mail-template.patch +RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php -i ${TMP_PATCH_DIR}/015-email-mail-template.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN rm -rf ${TMP_PATCH_DIR} -- GitLab From 8c329903150634a8212b43d018e8bc04048c5d7f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 12 Sep 2022 14:43:18 +0530 Subject: [PATCH 08/32] nextcloud 23.0.9 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e0e9e1f1..7dbf4ee8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:23.0.8-fpm AS nextcloud +FROM nextcloud:23.0.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.4" @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="381361" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/23,0,8,1/23,0,8,2/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,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 d59e8cf4d84d11cd5c1e81fe3c097e39bcbe53ad Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 14 Sep 2022 18:48:33 +0530 Subject: [PATCH 09/32] jobid and version updated --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7dbf4ee8..b2bf5eaa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,18 +2,18 @@ FROM nextcloud:23.0.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.4" -ARG THEME_HELPER_VERSION="version-fix-23" +ARG THEME_HELPER_VERSION="1.4.1" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.0" ARG CONTACTS_JOB_ID="372144" ARG CALENDAR_JOB_ID="372097" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="381352" +ARG EMAIL_RECOVERY_JOB_ID="386937" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_TAG="test-version-update-23" -ARG ECLOUD_LAUNCHER_JOB_ID="381361" +ARG EA_TAG="2.1.1" +ARG ECLOUD_LAUNCHER_JOB_ID="386947" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -- GitLab From b1490c7d4060e71ce6635de352a9e81d77a3fdf3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 14 Sep 2022 19:53:19 +0530 Subject: [PATCH 10/32] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b2bf5eaa..e2f6740d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="386947" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/23,0,9,1/23,0,9,2/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,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 6a64da91bcebdffea3d5e6fb0ad868bcc33bd14d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 14 Sep 2022 20:29:53 +0530 Subject: [PATCH 11/32] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e2f6740d..d0d1ad21 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.0" ARG CONTACTS_JOB_ID="372144" -ARG CALENDAR_JOB_ID="372097" +ARG CALENDAR_JOB_ID="387035" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="386937" ARG RAINLOOP_VERSION="7.2.5" -- GitLab From dba278667a45a6455e96b4fcd2e8e94825496717 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 14 Sep 2022 21:07:27 +0530 Subject: [PATCH 12/32] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d0d1ad21..5114d70c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="386947" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/23,0,9,1/23,0,9,3/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,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 fc556118d5f4cbc3dc3740f23a2288b9b468d712 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 15 Sep 2022 10:18:29 +0530 Subject: [PATCH 13/32] added profile and groupware patch --- Dockerfile | 2 ++ patches/019-patch_personalinfo.patch | 35 ++++++++++++++++++++++++++++ patches/020-groupware.patch | 11 +++++++++ 3 files changed, 48 insertions(+) create mode 100644 patches/019-patch_personalinfo.patch create mode 100644 patches/020-groupware.patch diff --git a/Dockerfile b/Dockerfile index 5114d70c..ab0ba8b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -127,6 +127,8 @@ RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/01 RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php -i ${TMP_PATCH_DIR}/015-email-mail-template.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch +RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/PersonalInfo.php -i ${TMP_PATCH_DIR}/019-personalinfo.patch +RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/020-groupware.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/019-patch_personalinfo.patch b/patches/019-patch_personalinfo.patch new file mode 100644 index 00000000..745311ad --- /dev/null +++ b/patches/019-patch_personalinfo.patch @@ -0,0 +1,35 @@ +From: Avinash +Date: Tue, 14 Sept 2022 17:58 +0530 +Subject: [PATCH] This patch hides the profile sections from personal info page + +This patch hides the profile sections from personal info page + +--- ./apps/settings/lib/Settings/Personal/PersonalInfo.php 2022-09-14 17:48:53.974177500 +0530 ++++ ./apps/settings/lib/Settings/Personal/PersonalInfo-new.php 2022-09-14 17:50:52.474177500 +0530 +@@ -166,7 +166,7 @@ + 'twitterVerification' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getVerified(), + 'groups' => $this->getGroups($user), + 'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(), +- 'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(), ++ 'profileEnabledGlobally' => false, + ] + $messageParameters + $languageParameters + $localeParameters; + + $personalInfoParameters = [ +@@ -174,7 +174,7 @@ + 'displayNameMap' => $this->getDisplayNameMap($account), + 'emailMap' => $this->getEmailMap($account), + 'languageMap' => $this->getLanguageMap($user), +- 'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(), ++ 'profileEnabledGlobally' => false, + 'profileEnabled' => $this->profileManager->isProfileEnabled($user), + 'organisationMap' => $this->getOrganisationMap($account), + 'roleMap' => $this->getRoleMap($account), +@@ -191,7 +191,7 @@ + 'profileConfig' => $this->profileManager->getProfileConfigWithMetadata($user, $user), + ]; + +- $this->initialStateService->provideInitialState('profileEnabledGlobally', $this->profileManager->isProfileEnabled()); ++ $this->initialStateService->provideInitialState('profileEnabledGlobally', false); + $this->initialStateService->provideInitialState('personalInfoParameters', $personalInfoParameters); + $this->initialStateService->provideInitialState('accountParameters', $accountParameters); + $this->initialStateService->provideInitialState('profileParameters', $profileParameters); diff --git a/patches/020-groupware.patch b/patches/020-groupware.patch new file mode 100644 index 00000000..126c5280 --- /dev/null +++ b/patches/020-groupware.patch @@ -0,0 +1,11 @@ +--- ./apps/settings/lib/Sections/Personal/Groupware.php 2022-09-08 11:20:19.355809900 +0530 ++++ ./apps/settings/lib/Sections/Personal/Groupware-new.php 2022-09-08 11:18:46.905809900 +0530 +@@ -45,7 +45,7 @@ + } + + public function getID(): string { +- return 'groupware'; ++ return ''; + } + + public function getName(): string { -- GitLab From 3ebaa9b1f4ae21a188ba5921d0a0d850c67e9435 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 15 Sep 2022 16:39:22 +0530 Subject: [PATCH 14/32] aremoved profile patch --- Dockerfile | 3 +- ...20-groupware.patch => 019-groupware.patch} | 0 patches/019-patch_personalinfo.patch | 35 ------------------- 3 files changed, 1 insertion(+), 37 deletions(-) rename patches/{020-groupware.patch => 019-groupware.patch} (100%) delete mode 100644 patches/019-patch_personalinfo.patch diff --git a/Dockerfile b/Dockerfile index ab0ba8b3..7fb1ef89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -127,8 +127,7 @@ RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/01 RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php -i ${TMP_PATCH_DIR}/015-email-mail-template.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch -RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/PersonalInfo.php -i ${TMP_PATCH_DIR}/019-personalinfo.patch -RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/020-groupware.patch +RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/020-groupware.patch b/patches/019-groupware.patch similarity index 100% rename from patches/020-groupware.patch rename to patches/019-groupware.patch diff --git a/patches/019-patch_personalinfo.patch b/patches/019-patch_personalinfo.patch deleted file mode 100644 index 745311ad..00000000 --- a/patches/019-patch_personalinfo.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Avinash -Date: Tue, 14 Sept 2022 17:58 +0530 -Subject: [PATCH] This patch hides the profile sections from personal info page - -This patch hides the profile sections from personal info page - ---- ./apps/settings/lib/Settings/Personal/PersonalInfo.php 2022-09-14 17:48:53.974177500 +0530 -+++ ./apps/settings/lib/Settings/Personal/PersonalInfo-new.php 2022-09-14 17:50:52.474177500 +0530 -@@ -166,7 +166,7 @@ - 'twitterVerification' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getVerified(), - 'groups' => $this->getGroups($user), - 'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(), -- 'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(), -+ 'profileEnabledGlobally' => false, - ] + $messageParameters + $languageParameters + $localeParameters; - - $personalInfoParameters = [ -@@ -174,7 +174,7 @@ - 'displayNameMap' => $this->getDisplayNameMap($account), - 'emailMap' => $this->getEmailMap($account), - 'languageMap' => $this->getLanguageMap($user), -- 'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(), -+ 'profileEnabledGlobally' => false, - 'profileEnabled' => $this->profileManager->isProfileEnabled($user), - 'organisationMap' => $this->getOrganisationMap($account), - 'roleMap' => $this->getRoleMap($account), -@@ -191,7 +191,7 @@ - 'profileConfig' => $this->profileManager->getProfileConfigWithMetadata($user, $user), - ]; - -- $this->initialStateService->provideInitialState('profileEnabledGlobally', $this->profileManager->isProfileEnabled()); -+ $this->initialStateService->provideInitialState('profileEnabledGlobally', false); - $this->initialStateService->provideInitialState('personalInfoParameters', $personalInfoParameters); - $this->initialStateService->provideInitialState('accountParameters', $accountParameters); - $this->initialStateService->provideInitialState('profileParameters', $profileParameters); -- GitLab From 89302f64bbba58e4efd99a61febe6faf0930d0c5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 16 Sep 2022 13:48:56 +0530 Subject: [PATCH 15/32] occ command for profile enabled added --- custom_entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 87606ea4..ab04dfe8 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -31,8 +31,8 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/murena_launcher/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ - rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ + docker exec -u www-data ecloud /var/www/html/occ config:system:set profile.enabled --value='false else echo "Skipping rsync step as version not updated!" fi -- GitLab From 5aed51a6d889ae3d39214ce2dbb1e2378fad25c3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 16 Sep 2022 13:59:37 +0530 Subject: [PATCH 16/32] occ command for profile enabled added --- custom_entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index ab04dfe8..294bb925 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -31,11 +31,11 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/murena_launcher/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ + rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ - docker exec -u www-data ecloud /var/www/html/occ config:system:set profile.enabled --value='false else echo "Skipping rsync step as version not updated!" fi - + su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value='false'" /entrypoint.sh "$@" -- GitLab From b5a7bae65886aa61f218cb51280e30d6a985411a Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 16 Sep 2022 14:59:49 +0530 Subject: [PATCH 17/32] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7fb1ef89..4d51afd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="386947" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/23,0,9,1/23,0,9,4/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,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 08668725d2bacfc4a26cfe50ecc50258848f974d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 16 Sep 2022 15:25:02 +0530 Subject: [PATCH 18/32] occ command for profile enabled added --- custom_entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 294bb925..4c06de7e 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -36,6 +36,6 @@ if version_greater "$image_version" "$installed_version"; then else echo "Skipping rsync step as version not updated!" fi - su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value='false'" + su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false" /entrypoint.sh "$@" -- GitLab From da98c7d5d94478028dbdaf638d6a9674ff60bb90 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 16 Sep 2022 16:13:25 +0530 Subject: [PATCH 19/32] occ command for profile enabled added --- custom_entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 4c06de7e..efd3b991 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -36,6 +36,6 @@ if version_greater "$image_version" "$installed_version"; then else echo "Skipping rsync step as version not updated!" fi - su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false" + su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean" /entrypoint.sh "$@" -- GitLab From b0983f238cc150d8556a14e7d8ab2b3c6a5d222c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 16 Sep 2022 17:14:38 +0530 Subject: [PATCH 20/32] notes updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4d51afd8..18cefa72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG THEME_VERSION="22.1.4" ARG THEME_HELPER_VERSION="1.4.1" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" -ARG NOTES_VERSION="4.5.0" +ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="372144" ARG CALENDAR_JOB_ID="387035" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -- GitLab From 935fc5c0419fc0adceed7a7dc8a8735f72d8b771 Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 16 Sep 2022 17:24:21 +0530 Subject: [PATCH 21/32] Fix custom entrypoint --- custom_entrypoint.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index efd3b991..08a5ec07 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -36,6 +36,11 @@ if version_greater "$image_version" "$installed_version"; then else echo "Skipping rsync step as version not updated!" fi - su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean" + +if [ "$(id -u)" = 0 ]; then + su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean" +else + sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean" +fi /entrypoint.sh "$@" -- GitLab From 54499b3442675fbf184ea0ed2840cbc5dff74b1a Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 19 Sep 2022 14:57:32 +0530 Subject: [PATCH 22/32] theme helper tag update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 18cefa72..898ae255 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM nextcloud:23.0.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.4" -ARG THEME_HELPER_VERSION="1.4.1" +ARG THEME_HELPER_VERSION="1.4.2" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.1" -- GitLab From 5ef00b2f9824dc13e667103663947e5ea9be7e89 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 19 Sep 2022 15:07:57 +0530 Subject: [PATCH 23/32] job id updated --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 898ae255..f73185e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:23.0.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="22.1.4" +ARG THEME_VERSION="22.1.5" ARG THEME_HELPER_VERSION="1.4.2" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" @@ -9,11 +9,11 @@ ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="372144" ARG CALENDAR_JOB_ID="387035" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="386937" +ARG EMAIL_RECOVERY_JOB_ID="389384" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_TAG="2.1.1" -ARG ECLOUD_LAUNCHER_JOB_ID="386947" +ARG ECLOUD_LAUNCHER_JOB_ID="389373" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -- GitLab From 513e8fe78ab1979f03a5088f93ba6b2e5f81bc35 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 19 Sep 2022 15:09:02 +0530 Subject: [PATCH 24/32] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f73185e2..0dcc8ec1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="389373" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/23,0,9,1/23,0,9,5/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,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 4b17dd8517eeac031e29bdf07d35929b7d324f3f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 19 Sep 2022 15:13:44 +0530 Subject: [PATCH 25/32] job id fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0dcc8ec1..0cbec5fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="372144" ARG CALENDAR_JOB_ID="387035" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="389384" +ARG EMAIL_RECOVERY_JOB_ID="389385" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_TAG="2.1.1" -- GitLab From 08322f8054550d1e00db62a7e7422fccb9f86ced Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 19 Sep 2022 15:32:50 +0530 Subject: [PATCH 26/32] lws sed --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0cbec5fd..65c4f656 100644 --- a/Dockerfile +++ b/Dockerfile @@ -130,6 +130,9 @@ 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 rm -rf ${TMP_PATCH_DIR} +# 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 + # autocomplete leak tweak apps frontend with sed, disable group suggestion RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js -- GitLab From ac616f638d369587dd596c71637c6931bb622c11 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 22 Sep 2022 10:12:46 +0530 Subject: [PATCH 27/32] sed added for error class --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 65c4f656..240087da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -151,6 +151,9 @@ RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/in # Remove changeAvatar in changeUserHook of ldap_write_support as it throws errors RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_apps/ldap_write_support/lib/LDAPUserManager.php +#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 + # 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 2064d7c68e4db2eef71445311e91518b1dcd1ca9 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 22 Sep 2022 16:06:51 +0530 Subject: [PATCH 28/32] fix showResetPwd in login --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 240087da..2e14b454 100644 --- a/Dockerfile +++ b/Dockerfile @@ -130,6 +130,9 @@ 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 rm -rf ${TMP_PATCH_DIR} +# show reset pwd page with a query param +RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' login.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 0cca83b6d5364e2d7da3a8d155108c3e7546468f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 23 Sep 2022 15:02:23 +0530 Subject: [PATCH 29/32] version bump and calendar job id update --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2e14b454..8b327736 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="372144" -ARG CALENDAR_JOB_ID="387035" +ARG CALENDAR_JOB_ID="390020" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="389385" ARG RAINLOOP_VERSION="7.2.5" @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="389373" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/23,0,9,1/23,0,9,6/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,7/' ${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 2dc8bb2a24e40218e8ce94dd8ef976b10127e39f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 27 Sep 2022 20:19:56 +0530 Subject: [PATCH 30/32] theme helper and contact app version and job id update with version bump --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b327736..ec168129 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,11 @@ FROM nextcloud:23.0.9-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.2" +ARG THEME_HELPER_VERSION="1.4.3" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.1" -ARG CONTACTS_JOB_ID="372144" +ARG CONTACTS_JOB_ID="395865" ARG CALENDAR_JOB_ID="390020" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="389385" @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="389373" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/23,0,9,1/23,0,9,7/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,8/' ${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 a857428cacc82136f696f41679bbbc7d35554025 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 3 Oct 2022 13:55:04 +0530 Subject: [PATCH 31/32] calendar job id change and version bump --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec168129..d49ad722 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="395865" -ARG CALENDAR_JOB_ID="390020" +ARG CALENDAR_JOB_ID="396773" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="389385" ARG RAINLOOP_VERSION="7.2.5" @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="389373" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/23,0,9,1/23,0,9,8/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,9/' ${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 8f794e1cd0c24982917ac105d139b550d79ead4b Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 5 Oct 2022 18:32:00 +0530 Subject: [PATCH 32/32] Version updates --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d49ad722..02371989 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ FROM nextcloud:23.0.9-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.3" +ARG THEME_HELPER_VERSION="1.4.4" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.1" -ARG CONTACTS_JOB_ID="395865" -ARG CALENDAR_JOB_ID="396773" +ARG CONTACTS_JOB_ID="400045" +ARG CALENDAR_JOB_ID="398394" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="389385" ARG RAINLOOP_VERSION="7.2.5" @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="389373" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/23,0,9,1/23,0,9,9/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,10/' ${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