diff --git a/Dockerfile b/Dockerfile index 3d6118069f8188f2947c86052536198ebda7d8ba..d987bde88959aa7c1a07d9a5b1a0c5ed16c43a32 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="812372" -ARG NOTES_VERSION="4.8.1" +ARG NOTES_VERSION="4.9.2" ARG CONTACTS_JOB_ID="740210" ARG CALENDAR_JOB_ID="812355" ARG EMAIL_RECOVERY_JOB_ID="738840" @@ -14,8 +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.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,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 @@ -105,6 +106,12 @@ 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.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; + + # Remove unzip when unzipping is done RUN apt-get -y remove unzip @@ -289,3 +296,9 @@ 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 + +# 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 diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index a42e4d01994569fc0c951cbe713c4038af68aa3a..98a3984ccdced10c7610dd56bf082a2f3e7cdc42 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!"