From 3e205a8ce3c148db8d0965b7821c6aa64e834d39 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 23 Jun 2023 10:19:31 +0530 Subject: [PATCH 01/27] nextcloud 25.0.7 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 238cb041..f91ca802 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:25.0.6-fpm AS nextcloud +FROM nextcloud:25.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="583519" @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.0" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,6,1/25,0,6,6/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,7,1/25,0,7,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 583d9df9e0d437d246edcb4be0dddf6a4abbee87 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 23 Jun 2023 10:41:09 +0530 Subject: [PATCH 02/27] update apps --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f91ca802..ccb3d227 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ FROM nextcloud:25.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="583519" -ARG NOTES_VERSION="4.7.2" +ARG THEME_HELPER_JOB_ID="614662" +ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="582012" ARG CALENDAR_JOB_ID="582001" ARG EMAIL_RECOVERY_JOB_ID="582038" ARG EA_JOB_ID="582028" -ARG LAUNCHER_JOB_ID="582666" +ARG LAUNCHER_JOB_ID="616075" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" -ARG DASHBOARD_JOB_ID="582062" +ARG DASHBOARD_JOB_ID="616067" ARG SNAPPY_VERSION="2.27.2" -ARG SNAPPY_THEME_VERSION="2.0.0" +ARG SNAPPY_THEME_VERSION="2.0.5" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -- GitLab From 51fd03a62bbafd163b96a57e3a60caaa4c43d8b6 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 23 Jun 2023 10:46:10 +0530 Subject: [PATCH 03/27] ea job id updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ccb3d227..622364da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="582012" ARG CALENDAR_JOB_ID="582001" ARG EMAIL_RECOVERY_JOB_ID="582038" -ARG EA_JOB_ID="582028" +ARG EA_JOB_ID="589808" ARG LAUNCHER_JOB_ID="616075" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG DASHBOARD_JOB_ID="616067" -- GitLab From 6dca68e99c6939d5c4bb0c84eb5838768b4fd5a7 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 23 Jun 2023 14:49:56 +0530 Subject: [PATCH 04/27] update apps --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 622364da..870d80ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="614662" ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="582012" -ARG CALENDAR_JOB_ID="582001" +ARG CALENDAR_JOB_ID="622875" ARG EMAIL_RECOVERY_JOB_ID="582038" ARG EA_JOB_ID="589808" ARG LAUNCHER_JOB_ID="616075" -- GitLab From 108eafef871137256fc011e67a980b5f78a9ab4f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 23 Jun 2023 14:52:49 +0530 Subject: [PATCH 05/27] update apps --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 870d80ad..88ce5c43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -177,7 +177,7 @@ RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Co From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="25.0.6" +ARG THEME_VERSION="25.0.11" ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0" ARG OIDC_LOGIN_VERSION="2.5.1" -- GitLab From 2d51b31ba0dabe19333bba912afc60201645c506 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 26 Jun 2023 16:09:28 +0530 Subject: [PATCH 06/27] update ecloud account --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 88ce5c43..b91595de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="582012" ARG CALENDAR_JOB_ID="622875" ARG EMAIL_RECOVERY_JOB_ID="582038" -ARG EA_JOB_ID="589808" +ARG EA_JOB_ID="625302" ARG LAUNCHER_JOB_ID="616075" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG DASHBOARD_JOB_ID="616067" -- GitLab From ea0a9bcf43520337fb04eb7527f7ccb7389ea604 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 26 Jun 2023 16:14:43 +0530 Subject: [PATCH 07/27] ecloud-theme helper and version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b91595de..d741e6d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.5" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,7,1/25,0,7,1/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,7,1/25,0,7,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 21f580a9299cb92e70b194811b1198441f82be64 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 26 Jun 2023 19:00:20 +0530 Subject: [PATCH 08/27] update contact app for starred --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d741e6d1..6dd29759 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM nextcloud:25.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="614662" +ARG THEME_HELPER_JOB_ID="625259" ARG NOTES_VERSION="4.8.0" -ARG CONTACTS_JOB_ID="582012" +ARG CONTACTS_JOB_ID="620997" ARG CALENDAR_JOB_ID="622875" ARG EMAIL_RECOVERY_JOB_ID="582038" ARG EA_JOB_ID="625302" -- GitLab From d07b7560363a52aeef5a7d1badc8f964c2282411 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 26 Jun 2023 19:35:40 +0530 Subject: [PATCH 09/27] update to 25.0.8 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6dd29759..b0536e94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:25.0.7-fpm AS nextcloud +FROM nextcloud:25.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="625259" @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.5" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,7,1/25,0,7,2/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,1/25,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 ed81cc746354ccdc94d61c32d58dd164d0558093 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 27 Jun 2023 12:58:21 +0530 Subject: [PATCH 10/27] theme helper job id updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b0536e94..ba70e411 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:25.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="625259" +ARG THEME_HELPER_JOB_ID="626338" ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="620997" ARG CALENDAR_JOB_ID="622875" -- GitLab From e4f3b1f4629d8bebc16fb8c4511cb745f07ee16c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 27 Jun 2023 14:01:49 +0530 Subject: [PATCH 11/27] theme version updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ba70e411..cce5392f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -177,7 +177,7 @@ RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Co From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="25.0.11" +ARG THEME_VERSION="25.0.12" ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0" ARG OIDC_LOGIN_VERSION="2.5.1" -- GitLab From ca9fe7bc883e81e3a2c85dfb0a2c0069893ac642 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 27 Jun 2023 15:07:18 +0530 Subject: [PATCH 12/27] snappy updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cce5392f..2f8148a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG LAUNCHER_JOB_ID="616075" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG DASHBOARD_JOB_ID="616067" ARG SNAPPY_VERSION="2.27.2" -ARG SNAPPY_THEME_VERSION="2.0.5" +ARG SNAPPY_THEME_VERSION="2.0.6" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -- GitLab From f075d59e98980946a3e52c07c905aa19bd8b3ac2 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 27 Jun 2023 15:08:00 +0530 Subject: [PATCH 13/27] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2f8148a1..1ae83594 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.6" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,1/25,0,8,1/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,1/25,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 7ab3ec76504e17e6b1721666563fa8e47f91b0c8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 28 Jun 2023 15:05:43 +0530 Subject: [PATCH 14/27] calendar job id updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1ae83594..17c9e146 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="626338" ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="620997" -ARG CALENDAR_JOB_ID="622875" +ARG CALENDAR_JOB_ID="628427" ARG EMAIL_RECOVERY_JOB_ID="582038" ARG EA_JOB_ID="625302" ARG LAUNCHER_JOB_ID="616075" -- GitLab From 051a49ea9194577ee0f7513580a8385b2ca688f3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 28 Jun 2023 15:06:19 +0530 Subject: [PATCH 15/27] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 17c9e146..b69b66ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.6" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,1/25,0,8,2/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,1/25,0,8,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 7201e3ffc21ab015d04f80f74a6175a78624faa8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 29 Jun 2023 15:13:45 +0530 Subject: [PATCH 16/27] oidc update to 2.6.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b69b66ee..e862a98d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -179,7 +179,7 @@ ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="25.0.12" ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0" -ARG OIDC_LOGIN_VERSION="2.5.1" +ARG OIDC_LOGIN_VERSION="2.6.0" # Patches COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab From df9eccb28ac270bfdfa243da006fe8f997a21d5d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 30 Jun 2023 11:53:31 +0530 Subject: [PATCH 17/27] snappy theme update regress --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e862a98d..d0f3a306 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG LAUNCHER_JOB_ID="616075" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG DASHBOARD_JOB_ID="616067" ARG SNAPPY_VERSION="2.27.2" -ARG SNAPPY_THEME_VERSION="2.0.6" +ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -- GitLab From 5b11ff57db25edd23522e19364c3f051cc0fe9de Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 3 Jul 2023 14:49:28 +0530 Subject: [PATCH 18/27] theme helper updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d0f3a306..e135c3cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:25.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="626338" +ARG THEME_HELPER_JOB_ID="632448" ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="620997" ARG CALENDAR_JOB_ID="628427" -- GitLab From c2c25316f76292bf4b20cd426a9b2a295134efd3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 3 Jul 2023 14:49:40 +0530 Subject: [PATCH 19/27] theme helper updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e135c3cb..7f40cd67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:25.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="632448" +ARG THEME_HELPER_JOB_ID="632476" ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="620997" ARG CALENDAR_JOB_ID="628427" -- GitLab From 85d92f6e76f0e30d01b8cac6936a516366baee3e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 3 Jul 2023 14:51:53 +0530 Subject: [PATCH 20/27] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7f40cd67..bad1d539 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,1/25,0,8,3/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,1/25,0,8,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 4167824fa44a2cead3dff56ea013bd2adfa1882b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Jul 2023 16:34:57 +0530 Subject: [PATCH 21/27] remove editorHint --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index bad1d539..260b4f77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -225,6 +225,7 @@ RUN sed -i 's/{name:"archive",icon:la,title:(0,be.Iu)("memories","Archive")},//g RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar-main.js RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[o,"displayname"\]},//' js/calendar-main.js +RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/OCA\\Notes\\Migration\\EditorHint<\/step>/''/' appinfo/info.xml # Remove colored background from email template logo RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php -- GitLab From 024171b1592d194cdf3f8a84595d42d14f89a61f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Jul 2023 16:55:12 +0530 Subject: [PATCH 22/27] remove editorHint --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 260b4f77..b787197b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,1/25,0,8,4/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,1/25,0,8,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 @@ -225,7 +225,7 @@ RUN sed -i 's/{name:"archive",icon:la,title:(0,be.Iu)("memories","Archive")},//g RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar-main.js RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[o,"displayname"\]},//' js/calendar-main.js -RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/OCA\\Notes\\Migration\\EditorHint<\/step>/''/' appinfo/info.xml +RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/OCA\\Notes\\Migration\\EditorHint<\/step>//g' appinfo/info.xml # Remove colored background from email template logo RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php -- GitLab From 407f6791fb53eb66149a987fe9aab6f5d9cd9a4a Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Jul 2023 17:15:14 +0530 Subject: [PATCH 23/27] remove editorHint --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b787197b..b1dd99ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,1/25,0,8,5/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,1/25,0,8,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 @@ -226,6 +226,8 @@ RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIV RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar-main.js RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[o,"displayname"\]},//' js/calendar-main.js RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/OCA\\Notes\\Migration\\EditorHint<\/step>//g' appinfo/info.xml +RUN cd ${BASE_DIR}/apps/theming && sed -i 's/OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' appinfo/info.xml + # Remove colored background from email template logo RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php -- GitLab From 675e2d02a95434abcff85dd63e660df4383c07a2 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Jul 2023 17:38:46 +0530 Subject: [PATCH 24/27] ecloud theme helper job id updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b1dd99ca..abf7aafb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:25.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="632476" +ARG THEME_HELPER_JOB_ID="635069" ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="620997" ARG CALENDAR_JOB_ID="628427" -- GitLab From 9a2ca0159dab03c00af17801d0427235e018aa3b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Jul 2023 17:50:46 +0530 Subject: [PATCH 25/27] ecloud theme helper job id updated --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index abf7aafb..6d32ac85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,1/25,0,8,6/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,1/25,0,8,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 @@ -225,8 +225,8 @@ RUN sed -i 's/{name:"archive",icon:la,title:(0,be.Iu)("memories","Archive")},//g RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar-main.js RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[o,"displayname"\]},//' js/calendar-main.js -RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/OCA\\Notes\\Migration\\EditorHint<\/step>//g' appinfo/info.xml -RUN cd ${BASE_DIR}/apps/theming && sed -i 's/OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' appinfo/info.xml +RUN sed -i 's/OCA\\Notes\\Migration\\EditorHint<\/step>//g' ${BASE_DIR}/custom_apps/notes/appinfo/info.xml +RUN sed -i 's/OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' ${BASE_DIR}/apps/theming/appinfo/info.xml # Remove colored background from email template logo -- GitLab From 4c8db510f07375aff45816431f6ee5d6a00d7626 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Jul 2023 18:04:20 +0530 Subject: [PATCH 26/27] ecloud theme helper job id updated --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d32ac85..69fe04b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,1/25,0,8,7/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,1/25,0,8,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 @@ -225,8 +225,8 @@ RUN sed -i 's/{name:"archive",icon:la,title:(0,be.Iu)("memories","Archive")},//g RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar-main.js RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[o,"displayname"\]},//' js/calendar-main.js -RUN sed -i 's/OCA\\Notes\\Migration\\EditorHint<\/step>//g' ${BASE_DIR}/custom_apps/notes/appinfo/info.xml -RUN sed -i 's/OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' ${BASE_DIR}/apps/theming/appinfo/info.xml +RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/OCA\\Notes\\Migration\\EditorHint<\/step>//g' appinfo/info.xml +RUN cd ${BASE_DIR}/apps/theming && sed -i 's/OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' appinfo/info.xml # Remove colored background from email template logo -- GitLab From 7649b7c066e0a758d6ba2e5f7f0ee07a85fefb08 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Jul 2023 19:03:20 +0530 Subject: [PATCH 27/27] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 69fe04b5..b9e6028f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,1/25,0,8,8/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,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