From f87985a26a71cb26db5edca61799b3e494d4f0df Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 2 Jan 2024 18:18:36 +0530 Subject: [PATCH 1/6] drop account app added --- Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Dockerfile b/Dockerfile index e6114c8d..1341c8a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ ARG SNAPPY_VERSION="2.29.1" ARG SNAPPY_THEME_VERSION="3.0.0" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" +ARG DROP_ACCOUNT_VERSION="2.4.0" RUN sed -i 's/26,0,8,2/26,0,8,13/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / @@ -105,6 +106,15 @@ RUN curl -fsSL -o memories.tar.gz \ tar -xf memories.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm memories.tar.gz; +RUN curl -fsSL -o drop_account-${DROP_ACCOUNT_VERSION}.tar.gz \ + "https://framagit.org/framasoft/nextcloud/drop_account/-/archive/${DROP_ACCOUNT_VERSION}/drop_account-${DROP_ACCOUNT_VERSION}.tar.gz" && \ + tar -xf drop_account-${DROP_ACCOUNT_VERSION}.tar.gz -C /tmp/ && \ + mkdir -p ${BASE_DIR}/custom_apps/drop_account && \ + mv /tmp/drop_account-${DROP_ACCOUNT_VERSION}/* ${BASE_DIR}/custom_apps/drop_account && \ + chown -R www-data:www-data ${BASE_DIR}/custom_apps/drop_account && \ + rm -rf drop_account-${DROP_ACCOUNT_VERSION}.tar.gz /tmp/drop_account-${DROP_ACCOUNT_VERSION} + + # Remove unzip when unzipping is done RUN apt-get -y remove unzip @@ -289,3 +299,6 @@ RUN if [ "$IS_SELFHOST" = false ]; then \ # Seds to fix displayname save regression RUN sed -i "s/'email' ||/'email'/" ${BASE_DIR}/apps/settings/js/federationsettingsview.js RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js + +# Seds to allow deletion of LDAP users +RUN sed -i "s/return in_array(\$user->getBackendClassName(), \['Database', 'Guests'\]);/return in_array(\$user->getBackendClassName(), ['Database', 'Guests', 'LDAP']);/" ${BASE_DIR}/custom_apps/drop_account/lib/Service/DeletionCapabilityService.php -- GitLab From e3b9a72a901ede3460dfd27357ab12c9b7fab7fb Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 2 Jan 2024 18:21:10 +0530 Subject: [PATCH 2/6] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1341c8a1..b2eeb66c 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.4.0" -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 57951ce9b711782e470cecd4859d0616023f8330 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 4 Jan 2024 13:30:03 +0530 Subject: [PATCH 3/6] hide sharing option in notes --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b2eeb66c..63c2a8f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,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="761085" -ARG NOTES_VERSION="4.8.1" +ARG NOTES_VERSION="4.9.2" ARG CONTACTS_JOB_ID="740210" ARG CALENDAR_JOB_ID="738789" ARG EMAIL_RECOVERY_JOB_ID="738840" @@ -302,3 +302,6 @@ RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federation # Seds to allow deletion of LDAP users RUN sed -i "s/return in_array(\$user->getBackendClassName(), \['Database', 'Guests'\]);/return in_array(\$user->getBackendClassName(), ['Database', 'Guests', 'LDAP']);/" ${BASE_DIR}/custom_apps/drop_account/lib/Service/DeletionCapabilityService.php + +# Seds to remove share option from notes +RUN sed -i ':a;N;$!ba;s/t("NcActionButton",{on:{click:e.onToggleSharing},scopedSlots:e._u(\[{key:"icon",fn:function(){return\[t("ShareVariantIcon",{attrs:{size:20}})\]},proxy:!0}\])},\[e._v("\\n\\t\\t\\t"+e._s(e.t("notes","Share"))+"\\n\\t\\t")\]),e._v(" "),/''/g' ${BASE_DIR}/custom_apps/notes/js/notes-main.js -- GitLab From 60df399c86cbfe0adacb0b7a58ddaf663310384b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 5 Jan 2024 21:32:38 +0530 Subject: [PATCH 4/6] added drop account app in resync --- custom_entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index a42e4d01..98a3984c 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 "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ 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 "/selfhost-theme-helper/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ else echo "Skipping rsync step as version not updated!" -- GitLab From 71b5ed1058aa15e78e7fc2ff22b7bea3475f96d8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 11 Jan 2024 15:22:38 +0530 Subject: [PATCH 5/6] drop account update --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55b06f46..eb655e97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,9 +14,9 @@ ARG SNAPPY_VERSION="2.29.1" ARG SNAPPY_THEME_VERSION="3.0.0" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" -ARG DROP_ACCOUNT_VERSION="2.4.0" +ARG DROP_ACCOUNT_VERSION="2.3.2" -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 61b3f7b2cd0dc5732963ba71c3e7a2e40acaa6a9 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 11 Jan 2024 16:00:18 +0530 Subject: [PATCH 6/6] drop account tar.gz url --- Dockerfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb655e97..d987bde8 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,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 @@ -106,13 +106,10 @@ RUN curl -fsSL -o memories.tar.gz \ tar -xf memories.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm memories.tar.gz; -RUN curl -fsSL -o drop_account-${DROP_ACCOUNT_VERSION}.tar.gz \ - "https://framagit.org/framasoft/nextcloud/drop_account/-/archive/${DROP_ACCOUNT_VERSION}/drop_account-${DROP_ACCOUNT_VERSION}.tar.gz" && \ - tar -xf drop_account-${DROP_ACCOUNT_VERSION}.tar.gz -C /tmp/ && \ - mkdir -p ${BASE_DIR}/custom_apps/drop_account && \ - mv /tmp/drop_account-${DROP_ACCOUNT_VERSION}/* ${BASE_DIR}/custom_apps/drop_account && \ - chown -R www-data:www-data ${BASE_DIR}/custom_apps/drop_account && \ - rm -rf drop_account-${DROP_ACCOUNT_VERSION}.tar.gz /tmp/drop_account-${DROP_ACCOUNT_VERSION} +RUN curl -fsSL -o drop_account.tar.gz \ + "https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-${DROP_ACCOUNT_VERSION}.tar.gz" && \ + tar -xf drop_account.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + rm drop_account.tar.gz; -- GitLab