From 448a79f621474164697c24ea57f82c37c51754c7 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 3 Jan 2024 11:44:11 +0530 Subject: [PATCH 01/17] selfhost 26 dev theme --- Dockerfile | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6114c8d..63907a54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -163,17 +163,25 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ rm user_backend_sql_raw.tar.gz; # Selfhost theme +#RUN if [ "$IS_SELFHOST" = true ]; then \ + # curl -fsSL -o selfhost-theme-helper.tar.gz \ + # "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ + # tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ + # mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ + # chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ + # rm -f selfhost-theme-helper.tar.gz;\ + #fi + RUN if [ "$IS_SELFHOST" = true ]; then \ - curl -fsSL -o selfhost-theme-helper.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ - mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ + curl -fsSL -o selfhost-theme-helper-dev-selfhost-26.tar.gz \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/dev/selfhost-26/selfhost-theme-helper-dev-selfhost-26.tar.gz" && \ + tar -xf selfhost-theme-helper-dev-selfhost-26.tar.gz -C /tmp/ && \ + mv /tmp/selfhost-theme-helper-dev-selfhost-26/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ - rm -f selfhost-theme-helper.tar.gz;\ + rm -f selfhost-theme-helper-dev-selfhost-26.tar.gz;\ fi - # Set default class of hidden to settings-hint RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php -- GitLab From 4ff6312813512acbeb453bb18de4674a78117eec Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 4 Jan 2024 23:59:03 +0530 Subject: [PATCH 02/17] check old launcher id --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63907a54..b06fe729 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG CONTACTS_JOB_ID="740210" ARG CALENDAR_JOB_ID="738789" ARG EMAIL_RECOVERY_JOB_ID="738840" ARG EA_JOB_ID="738865" -ARG LAUNCHER_JOB_ID="798389" +ARG LAUNCHER_JOB_ID="738816" ARG GOOGLE_INTEGRATION_VERSION="2.1.0" ARG DASHBOARD_JOB_ID="748055" ARG SNAPPY_VERSION="2.29.1" @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="3.0.0" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" -RUN sed -i 's/26,0,8,2/26,0,8,13/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,14/' ${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 098f2a576af4ee320a813ab8da33ab13ee6d09c9 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 5 Jan 2024 00:10:06 +0530 Subject: [PATCH 03/17] check old launcher id --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b06fe729..e037b614 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG CONTACTS_JOB_ID="740210" ARG CALENDAR_JOB_ID="738789" ARG EMAIL_RECOVERY_JOB_ID="738840" ARG EA_JOB_ID="738865" -ARG LAUNCHER_JOB_ID="738816" +ARG LAUNCHER_JOB_ID="798389" ARG GOOGLE_INTEGRATION_VERSION="2.1.0" ARG DASHBOARD_JOB_ID="748055" ARG SNAPPY_VERSION="2.29.1" @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="3.0.0" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" -RUN sed -i 's/26,0,8,2/26,0,8,14/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,15/' ${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 c055f8656ec1633f3dfcad6e8e907ee6a2f50f5b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 5 Jan 2024 13:29:32 +0530 Subject: [PATCH 04/17] selfhost theme compatible with nextcloud 26 --- Dockerfile | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index d5195071..b8a01b9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -123,7 +123,7 @@ ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="26.0.0" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG SELFHOST_THEME_VERSION="1.0.0" +ARG SELFHOST_THEME_VERSION="2.0.0" ARG IS_SELFHOST=true # Patches @@ -163,25 +163,17 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ rm user_backend_sql_raw.tar.gz; # Selfhost theme -#RUN if [ "$IS_SELFHOST" = true ]; then \ - # curl -fsSL -o selfhost-theme-helper.tar.gz \ - # "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - # tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ - # mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ - # chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ - # rm -f selfhost-theme-helper.tar.gz;\ - #fi - RUN if [ "$IS_SELFHOST" = true ]; then \ - curl -fsSL -o selfhost-theme-helper-dev-selfhost-26.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/dev/selfhost-26/selfhost-theme-helper-dev-selfhost-26.tar.gz" && \ - tar -xf selfhost-theme-helper-dev-selfhost-26.tar.gz -C /tmp/ && \ - mv /tmp/selfhost-theme-helper-dev-selfhost-26/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ + curl -fsSL -o selfhost-theme-helper.tar.gz \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ + tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ + mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ - rm -f selfhost-theme-helper-dev-selfhost-26.tar.gz;\ + rm -f selfhost-theme-helper.tar.gz;\ fi + # Set default class of hidden to settings-hint RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php -- GitLab From 8725ef134f1953700d21e3bc072c30ad46180f96 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 5 Jan 2024 14:18:54 +0530 Subject: [PATCH 05/17] fix version --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b8a01b9d..1f678d82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -167,13 +167,14 @@ RUN if [ "$IS_SELFHOST" = true ]; then \ curl -fsSL -o selfhost-theme-helper.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ - mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ + mv /tmp/selfhost-theme-helper-${SELFHOST_THEME_VERSION}/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ rm -f selfhost-theme-helper.tar.gz;\ fi + # Set default class of hidden to settings-hint RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php -- GitLab From 731e1407bc8fb3aabf80a7221d938fcb8213d8fb Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 5 Jan 2024 15:00:02 +0530 Subject: [PATCH 06/17] sharing search by email for contact fix --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1f678d82..b903e2af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -257,6 +257,9 @@ RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[a,"displayname"\]}, 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 +# sharing search by email +RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/Dv.principalPropertySearchByDisplayname(t);/Dv.principalPropertySearch(\[{name:\["http:\/\/sabredav.org\/ns","email-address"\]\}],t,"anyof");/g' js/contacts-main.js + #enable email search in memories app RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/shareTypes:\[bc\.D\.SHARE_TYPE_USER,bc\.D\.SHARE_TYPE_GROUP\]}});/shareTypes:[bc.D.SHARE_TYPE_USER,bc.D.SHARE_TYPE_EMAIL]}}),n=e.data.ocs.data.filter((e=>"emails"!==e.source)),r={data:{ocs:{meta:e.data.ocs.meta,data:n}}};/g' js/memories-main.js -- GitLab From 48e9056f973911a8936a826082b6c7de78024028 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 8 Jan 2024 16:30:51 +0530 Subject: [PATCH 07/17] launcher and contact dev job id added --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b903e2af..7114cec0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,11 @@ ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="812372" ARG NOTES_VERSION="4.8.1" -ARG CONTACTS_JOB_ID="740210" +ARG CONTACTS_JOB_ID="813653" ARG CALENDAR_JOB_ID="812355" ARG EMAIL_RECOVERY_JOB_ID="738840" ARG EA_JOB_ID="738865" -ARG LAUNCHER_JOB_ID="798389" +ARG LAUNCHER_JOB_ID="814000" ARG GOOGLE_INTEGRATION_VERSION="2.1.0" ARG DASHBOARD_JOB_ID="748055" ARG SNAPPY_VERSION="2.29.1" -- GitLab From a01a1e703e68e5621629ed0f3fc622aef878dd61 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 8 Jan 2024 16:46:31 +0530 Subject: [PATCH 08/17] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7114cec0..8c367efd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="3.0.0" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" -RUN sed -i 's/26,0,8,2/26,0,8,15/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,16/' ${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 e3b07b89e02a1f5fc882339f59ee53fcde977fe7 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 9 Jan 2024 18:09:45 +0530 Subject: [PATCH 09/17] launcher job id update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8c367efd..f74a2525 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG CONTACTS_JOB_ID="813653" ARG CALENDAR_JOB_ID="812355" ARG EMAIL_RECOVERY_JOB_ID="738840" ARG EA_JOB_ID="738865" -ARG LAUNCHER_JOB_ID="814000" +ARG LAUNCHER_JOB_ID="818418" ARG GOOGLE_INTEGRATION_VERSION="2.1.0" ARG DASHBOARD_JOB_ID="748055" ARG SNAPPY_VERSION="2.29.1" -- GitLab From 5f54d44d13e5fae39b6362dfdc026c9bcbbf5d24 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 10 Jan 2024 18:38:27 +0530 Subject: [PATCH 10/17] launcher new released job id added and version bump --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f74a2525..c88b0577 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG CONTACTS_JOB_ID="813653" ARG CALENDAR_JOB_ID="812355" ARG EMAIL_RECOVERY_JOB_ID="738840" ARG EA_JOB_ID="738865" -ARG LAUNCHER_JOB_ID="818418" +ARG LAUNCHER_JOB_ID="819432" ARG GOOGLE_INTEGRATION_VERSION="2.1.0" ARG DASHBOARD_JOB_ID="748055" ARG SNAPPY_VERSION="2.29.1" @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="3.0.0" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" -RUN sed -i 's/26,0,8,2/26,0,8,16/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,17/' ${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 668d39aef6b109a6a5b634a6a2c6c430592cf36e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 11 Jan 2024 16:22:02 +0530 Subject: [PATCH 11/17] added contact 5.5.1 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac83a74a..a91abe12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="812372" ARG NOTES_VERSION="4.9.2" -ARG CONTACTS_JOB_ID="813653" +ARG CONTACTS_JOB_ID="820871" ARG CALENDAR_JOB_ID="812355" ARG EMAIL_RECOVERY_JOB_ID="738840" ARG EA_JOB_ID="738865" @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" ARG DROP_ACCOUNT_VERSION="2.3.2" -RUN sed -i 's/26,0,8,2/26,0,8,17/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,18/' ${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 dc0a1d35cfe89547791bc45c542a35ce2a0bd09c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 11 Jan 2024 16:51:08 +0530 Subject: [PATCH 12/17] added contact app devid --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a91abe12..8151881b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="812372" ARG NOTES_VERSION="4.9.2" -ARG CONTACTS_JOB_ID="820871" +ARG CONTACTS_JOB_ID="820903" ARG CALENDAR_JOB_ID="812355" ARG EMAIL_RECOVERY_JOB_ID="738840" ARG EA_JOB_ID="738865" @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" ARG DROP_ACCOUNT_VERSION="2.3.2" -RUN sed -i 's/26,0,8,2/26,0,8,18/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,19/' ${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 f35639e32f3c3359338806aba50ad8aa9d4d80c3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 11 Jan 2024 19:17:19 +0530 Subject: [PATCH 13/17] sed fix for contact 5.5.1 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8151881b..81cda50a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" ARG DROP_ACCOUNT_VERSION="2.3.2" -RUN sed -i 's/26,0,8,2/26,0,8,19/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,20/' ${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 @@ -265,7 +265,7 @@ RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/OCA\\Notes\\Migration\\E RUN cd ${BASE_DIR}/apps/theming && sed -i 's/OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' appinfo/info.xml # sharing search by email -RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/Dv.principalPropertySearchByDisplayname(t);/Dv.principalPropertySearch(\[{name:\["http:\/\/sabredav.org\/ns","email-address"\]\}],t,"anyof");/g' js/contacts-main.js +RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/$S.principalPropertySearchByDisplayname(t);/$S.principalPropertySearch(\[{name:\["http:\/\/sabredav.org\/ns","email-address"\]\}],t,"anyof");/g' js/contacts-main.js #enable email search in memories app -- GitLab From 7099bc85dba4646c47d1e3c8f4258e911acc150b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 12 Jan 2024 10:58:35 +0530 Subject: [PATCH 14/17] contact job id update --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81cda50a..8eb490b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="812372" ARG NOTES_VERSION="4.9.2" -ARG CONTACTS_JOB_ID="820903" +ARG CONTACTS_JOB_ID="821699" ARG CALENDAR_JOB_ID="812355" ARG EMAIL_RECOVERY_JOB_ID="738840" ARG EA_JOB_ID="738865" @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" ARG DROP_ACCOUNT_VERSION="2.3.2" -RUN sed -i 's/26,0,8,2/26,0,8,20/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,21/' ${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 29f254ddd2bcbdc4fbd857408f67148127ee4446 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 12 Jan 2024 15:37:07 +0530 Subject: [PATCH 15/17] UI fixes for contact 5.5.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8eb490b6..713de2bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:26.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="812372" +ARG THEME_HELPER_JOB_ID="821764" ARG NOTES_VERSION="4.9.2" ARG CONTACTS_JOB_ID="821699" ARG CALENDAR_JOB_ID="812355" -- GitLab From aa8f1891da816b7ee84e302615818c6d86ae1595 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 17 Jan 2024 09:59:53 +0530 Subject: [PATCH 16/17] contact 5.5.1 ui fix2 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 713de2bb..32a60dfc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:26.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="821764" +ARG THEME_HELPER_JOB_ID="824645" ARG NOTES_VERSION="4.9.2" ARG CONTACTS_JOB_ID="821699" ARG CALENDAR_JOB_ID="812355" @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" ARG DROP_ACCOUNT_VERSION="2.3.2" -RUN sed -i 's/26,0,8,2/26,0,8,21/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,22/' ${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 651a74f0a9e8fad321076070adc7f350ad6dcd24 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 22 Jan 2024 11:31:08 +0530 Subject: [PATCH 17/17] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bf5d9550..ef9aa6e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="6.1.5" ARG DROP_ACCOUNT_VERSION="2.3.2" -RUN sed -i 's/26,0,8,2/26,0,8,22/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,23/' ${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