Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4502172 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'deb/nc-30-snappymail' into 'main' 

removed snappymail from rsync

See merge request !268
parents b33ce1ce 3ebaf24d

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -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,6/' ${BASE_DIR}/version.php

RUN sed -i 's/30,0,14,1/30,0,14,8/' ${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

custom_entrypoint.sh

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ if version_greater "$image_version" "$installed_version"; then 
    rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/murena-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/

    rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/

    #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/