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

Commit 3c65ddf2 authored by Florent VINCENT's avatar Florent VINCENT 👾
Browse files

Merge branch 'contact-upgrade-and-no-reset-eelo-on-upgrade' into 'master' 

update contact app to latest 4.0.1 and prevent nc upgrade to reset eelo theme

See merge request !32
parents 9f0c6cc6 b7f5d1ac

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ ARG THEME_VERSION="20.0.11" 
ARG NEWS_VERSION="16.0.0"

ARG QUOTA_WARN_VERSION="1.9.1"

ARG NOTES_VERSION="4.1.0"

ARG CONTACTS_VERSION="4.0.0"

ARG CONTACTS_VERSION="4.0.1"

ARG CALENDAR_VERSION="2.3.1"

ARG USER_BACKEND_RAW_SQL_VERSION="1.1.0"

ARG EMAIL_RECOVERY_JOB_ID="162557"
@@ -40,7 +40,7 @@ RUN curl -fsSL -o notes.tar.gz \ 
    rm notes.tar.gz;



RUN curl -fsSL -o contacts.tar.gz \

    "https://github.com/nextcloud/contacts/releases/download/v${CONTACTS_VERSION}/contacts.tar.gz" && \

    "https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts.tar.gz" && \

    tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm contacts.tar.gz;

custom_entrypoint.sh

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ rsync $rsync_options --include "/ecloud_drop_account" --exclude '/*' $SRC_DIR/cu 


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



# force eelo theme not to be disabled even when there is an upgrade process launched

sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('theme', 'eelo');/g" $DST_DIR/lib/base.php



/entrypoint.sh "$@"



# force eelo theme to be (re)loaded after an upgrade