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

Commit 043a93b6 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/fix-rsync' into 'main' 

Add rsync steps to snappy and snappy theme

See merge request !166
parents 66251edb 234aa016

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="525503" 
ARG SNAPPY_VERSION="2.26.3"

ARG SNAPPY_THEME_VERSION="1.2.3"



RUN sed -i 's/24,0,10,1/24,0,10,9/' ${BASE_DIR}/version.php

RUN sed -i 's/24,0,10,1/24,0,10,10/' ${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

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

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

    rsync $rsync_options --include "/ecloud-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 "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/

    rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/

else

    echo "Skipping rsync step as version not updated!"

fi