From 9ee944d64e3b62318d171f889ea66c1884fc6331 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 12 Aug 2025 16:15:58 +0530 Subject: [PATCH 01/11] fix(sso): correct redirect after 'forgot password' flow --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3fa7ae8..8cbc8c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ ARG NOTES_VERSION="4.11.0" ARG CONTACTS_JOB_ID="1273569" ARG CALENDAR_JOB_ID="1273554" ARG EMAIL_RECOVERY_JOB_ID="1273659" -ARG EA_JOB_ID="1273772" -ARG LAUNCHER_JOB_ID="1273647" +ARG EA_JOB_ID="1289725" +ARG LAUNCHER_JOB_ID="1290271" ARG GOOGLE_INTEGRATION_VERSION="3.2.0" ARG DASHBOARD_JOB_ID="1273623" ARG SNAPPY_VERSION="2.37.2" @@ -236,6 +236,9 @@ RUN rm -rf ${TMP_PATCH_DIR} # Remove user avatar generation for system addressbook card RUN sed -i 's/$this->getAvatarImage($user)/null/' ${BASE_DIR}/apps/dav/lib/CardDAV/Converter.php +# redirect user to sso login on successful resetting password +RUN cd ${BASE_DIR}/dist && sed -i "s|window\.location\.href=(0,g\.Jv)(\"login\")|window.location.href = '/apps/oidc_login/oidc'|g" core-login.js + # show reset pwd page with a query param # RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js -- GitLab From 81b58bd42c594251d0023695b85741bc52be66ea Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 13 Aug 2025 12:06:16 +0530 Subject: [PATCH 02/11] fix(oidc_login): change sed redirect path in core-login.js from /apps/oidc_login/oidc to / --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8cbc8c6..cd0024b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -237,7 +237,7 @@ RUN rm -rf ${TMP_PATCH_DIR} RUN sed -i 's/$this->getAvatarImage($user)/null/' ${BASE_DIR}/apps/dav/lib/CardDAV/Converter.php # redirect user to sso login on successful resetting password -RUN cd ${BASE_DIR}/dist && sed -i "s|window\.location\.href=(0,g\.Jv)(\"login\")|window.location.href = '/apps/oidc_login/oidc'|g" core-login.js +RUN cd ${BASE_DIR}/dist && sed -i "s|window\.location\.href=(0,g\.Jv)(\"login\")|window.location.href = '/'|g" core-login.js # show reset pwd page with a query param # RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js -- GitLab From 41e691d6e238d3a8cfef335785a77e2e2773f782 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 13 Aug 2025 18:35:21 +0530 Subject: [PATCH 03/11] chore: disable user_backend_sql_raw until proper release asset is available --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd0024b..9fb814a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -133,7 +133,7 @@ From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="26.0.2" -ARG USER_BACKEND_RAW_SQL_VERSION="2.0.1" +#ARG USER_BACKEND_RAW_SQL_VERSION="2.0.1" ARG SELFHOST_THEME_VERSION="2.0.0" ARG IS_SELFHOST=true @@ -168,10 +168,10 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ # User Backend -RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ - "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \ - tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - rm user_backend_sql_raw.tar.gz; +#RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ +# "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \ +# tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \ +# rm user_backend_sql_raw.tar.gz; # Selfhost theme RUN if [ "$IS_SELFHOST" = true ]; then \ -- GitLab From 563526d54f866886c589b0a509b1a26bdb501891 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 26 Aug 2025 11:43:42 +0530 Subject: [PATCH 04/11] upgrade to 30.0.14 and commented snappymail --- Dockerfile | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9fb814a..ba582d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,22 @@ FROM nextcloud:30.0.13-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="1273671" +ARG THEME_HELPER_JOB_ID="1298328" ARG NOTES_VERSION="4.11.0" -ARG CONTACTS_JOB_ID="1273569" -ARG CALENDAR_JOB_ID="1273554" -ARG EMAIL_RECOVERY_JOB_ID="1273659" +ARG CONTACTS_JOB_ID="1303540" +ARG CALENDAR_JOB_ID="1303567" +ARG EMAIL_RECOVERY_JOB_ID="1268990" ARG EA_JOB_ID="1289725" -ARG LAUNCHER_JOB_ID="1290271" +ARG LAUNCHER_JOB_ID="1298377" ARG GOOGLE_INTEGRATION_VERSION="3.2.0" -ARG DASHBOARD_JOB_ID="1273623" +ARG DASHBOARD_JOB_ID="1298444" ARG SNAPPY_VERSION="2.37.2" ARG SNAPPY_THEME_VERSION="4.0.4" ARG USER_MIGRATION_JOB_ID="1273698" ARG MEMORIES_VERSION="7.5.2" ARG DROP_ACCOUNT_VERSION="2.7.1" -RUN sed -i 's/30,0,13,1/30,0,13,8/' ${BASE_DIR}/version.php +RUN sed -i 's/30,0,14,1/30,0,14,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 @@ -78,10 +78,10 @@ RUN curl -fsSL -o ecloud-dashboard.zip \ mv dist/murena-dashboard ${BASE_DIR}/custom_apps/ && \ rm ecloud-dashboard.zip; -RUN curl -fsSL -o snappymail.tar.gz \ - "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \ - tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - rm snappymail.tar.gz; +#RUN curl -fsSL -o snappymail.tar.gz \ +# "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \ +# tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \ +# rm snappymail.tar.gz; RUN curl -fsSL -o user_migration.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/user_migration/-/jobs/${USER_MIGRATION_JOB_ID}/artifacts/download" && \ @@ -90,19 +90,19 @@ RUN curl -fsSL -o user_migration.zip \ rm user_migration.zip; # Fix snappymail icon -RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml +#RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml # Hide personal settings of snappymail -RUN sed -i "s/'additional'/null/" ${BASE_DIR}/custom_apps/snappymail/lib/Settings/PersonalSettings.php +#RUN sed -i "s/'additional'/null/" ${BASE_DIR}/custom_apps/snappymail/lib/Settings/PersonalSettings.php # Snappy theme -RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ - tar -xf Murena-snappymail-theme.tar.gz -C /tmp/ && \ - mkdir -p ${BASE_DIR}/themes/Murena && \ - mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena/snappymail && \ - chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \ - rm -rf Murena-snappymail-theme.tar.gz +#RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \ +# "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ +# tar -xf Murena-snappymail-theme.tar.gz -C /tmp/ && \ +# mkdir -p ${BASE_DIR}/themes/Murena && \ +# mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena/snappymail && \ +# chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \ +# rm -rf Murena-snappymail-theme.tar.gz RUN curl -fsSL -o memories.tar.gz \ "https://github.com/pulsejet/memories/releases/download/v${MEMORIES_VERSION}/memories.tar.gz" && \ -- GitLab From 9d11c966922610cb5363d1c12fed91af62babe35 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 26 Aug 2025 16:23:48 +0530 Subject: [PATCH 05/11] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ba582d3..0abc76b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="1273698" ARG MEMORIES_VERSION="7.5.2" ARG DROP_ACCOUNT_VERSION="2.7.1" -RUN sed -i 's/30,0,14,1/30,0,14,1/' ${BASE_DIR}/version.php +RUN sed -i 's/30,0,14,1/30,0,14,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 800326cbc505ed14ffed52e7c270f4bb8d57da58 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 26 Aug 2025 18:54:36 +0530 Subject: [PATCH 06/11] update to nextcloud:30.0.14-fpm --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0abc76b..d96647e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:30.0.13-fpm AS nextcloud +FROM nextcloud:30.0.14-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="1298328" -- GitLab From f19bf6c17bb41b17ca5075598344533bc247f831 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 26 Aug 2025 20:10:08 +0530 Subject: [PATCH 07/11] commented notification sed --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d96647e..cc91c34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -243,7 +243,7 @@ RUN cd ${BASE_DIR}/dist && sed -i "s|window\.location\.href=(0,g\.Jv)(\"login\") # RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js # add attr about how many notifications to notif icon -RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-atbzHwwu.chunk.mjs +#RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-atbzHwwu.chunk.mjs # Rename Memories to Gallery RUN sed -i 's/Memories<\/name>/Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml -- GitLab From fda682317428a344469c9a7d7eb30eaecdccc6c6 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 2 Sep 2025 12:21:04 +0530 Subject: [PATCH 08/11] added notification sed back and version bump --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index cc91c34..899e1ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="1273698" ARG MEMORIES_VERSION="7.5.2" ARG DROP_ACCOUNT_VERSION="2.7.1" -RUN sed -i 's/30,0,14,1/30,0,14,2/' ${BASE_DIR}/version.php +RUN sed -i 's/30,0,14,1/30,0,14,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 @@ -207,7 +207,7 @@ From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="29.0.16" -ARG LDAP_WRITE_SUPPORT_VERSION="1.11.1" +ARG LDAP_WRITE_SUPPORT_VERSION="1.12.1" ARG IS_SELFHOST=false RUN curl -fsSL -o ldap_write_support.tar.gz \ @@ -237,13 +237,13 @@ RUN rm -rf ${TMP_PATCH_DIR} RUN sed -i 's/$this->getAvatarImage($user)/null/' ${BASE_DIR}/apps/dav/lib/CardDAV/Converter.php # redirect user to sso login on successful resetting password -RUN cd ${BASE_DIR}/dist && sed -i "s|window\.location\.href=(0,g\.Jv)(\"login\")|window.location.href = '/'|g" core-login.js +#RUN cd ${BASE_DIR}/dist && sed -i "s|window\.location\.href=(0,g\.Jv)(\"login\")|window.location.href = '/'|g" core-login.js # show reset pwd page with a query param # RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js # add attr about how many notifications to notif icon -#RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-atbzHwwu.chunk.mjs +RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-DS2Cdf60.chunk.mjs # Rename Memories to Gallery RUN sed -i 's/Memories<\/name>/Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml -- GitLab From dcec6ef1ccc59d12a52cf4f36225cfa18248a343 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 2 Sep 2025 14:43:19 +0530 Subject: [PATCH 09/11] Updated job ids --- Dockerfile | 16 ++++++++-------- custom_entrypoint.sh | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 899e1ff..ce43ce6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ FROM nextcloud:30.0.14-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="1298328" +ARG THEME_HELPER_JOB_ID="1313213" ARG NOTES_VERSION="4.11.0" -ARG CONTACTS_JOB_ID="1303540" -ARG CALENDAR_JOB_ID="1303567" -ARG EMAIL_RECOVERY_JOB_ID="1268990" -ARG EA_JOB_ID="1289725" -ARG LAUNCHER_JOB_ID="1298377" +ARG CONTACTS_JOB_ID="1313223" +ARG CALENDAR_JOB_ID="1313255" +ARG EMAIL_RECOVERY_JOB_ID="1313239" +ARG EA_JOB_ID="1289726" +ARG LAUNCHER_JOB_ID="1313268" ARG GOOGLE_INTEGRATION_VERSION="3.2.0" -ARG DASHBOARD_JOB_ID="1298444" +ARG DASHBOARD_JOB_ID="1313279" ARG SNAPPY_VERSION="2.37.2" ARG SNAPPY_THEME_VERSION="4.0.4" -ARG USER_MIGRATION_JOB_ID="1273698" +ARG USER_MIGRATION_JOB_ID="1313296" ARG MEMORIES_VERSION="7.5.2" ARG DROP_ACCOUNT_VERSION="2.7.1" diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 2e38523..08fc883 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -34,6 +34,7 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ rsync $rsync_options --include "/memories/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/drop_account/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ + rsync $rsync_options --include "/user_migration/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/selfhost-theme-helper/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ else echo "Skipping rsync step as version not updated!" -- GitLab From 588d4feb4c6b57cb632e67630cd191f14952801e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 2 Sep 2025 14:49:48 +0530 Subject: [PATCH 10/11] Update theme version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ce43ce6..68efb64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -206,7 +206,7 @@ RUN sed -i "s/ajax\/getstoragestats/api\/v1\/stats/g" ${BASE_DIR}/apps/files/js/ From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="29.0.16" +ARG THEME_VERSION="30.0.0" ARG LDAP_WRITE_SUPPORT_VERSION="1.12.1" ARG IS_SELFHOST=false -- GitLab From 2b4bb9534d761780be0c93e2b3b71cf2f5e58da4 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 2 Sep 2025 14:54:07 +0530 Subject: [PATCH 11/11] version bump nextcloud 30 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 68efb64..d9e31b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="1313296" ARG MEMORIES_VERSION="7.5.2" ARG DROP_ACCOUNT_VERSION="2.7.1" -RUN sed -i 's/30,0,14,1/30,0,14,3/' ${BASE_DIR}/version.php +RUN sed -i 's/30,0,14,1/30,0,14,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