diff --git a/Dockerfile b/Dockerfile index 172989fe70273d145813e5e07a7aa8261a7c1ca5..4ef42cfda431419da449781109e48b20d9c03bea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ ARG DASHBOARD_JOB_ID="582062" ARG SNAPPY_VERSION="2.27.2" 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,5/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / @@ -99,6 +100,12 @@ RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \ 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" && \ + tar -xf memories.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + rm memories.tar.gz; + + # Remove unzip when unzipping is done RUN apt-get -y remove unzip @@ -204,7 +211,9 @@ RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$c RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==e.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js # Add data-object-type to notification RUN sed -i 's/"data-id":e.notificationId,/"data-id":e.notificationId,"data-object-type":e.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js - +#Hide Archive/Unarchive feature in memories app +RUN sed -i 's/{name:(0,be.Iu)("memories","Archive"),icon:la,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchive()&&!this.routeIsAlbum()},{name:(0,be.Iu)("memories","Unarchive"),icon:ua,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchive()},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js +RUN sed -i 's/{name:"archive",icon:la,title:(0,be.Iu)("memories","Archive")},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js # autocomplete leak tweak apps frontend with sed, disable group suggestion RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index c4dbbcc260da9b6193061cf09e8175cec002d1ff..7c7d3f464c7c0be2c718656e40076a9c38e7fb6c 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -33,6 +33,7 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ 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/ else echo "Skipping rsync step as version not updated!" fi