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

Commit 13b74407 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

command moved and version bump

parent cca3521c

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" 
ARG GOOGLE_INTEGRATION_VERSION="1.0.8"

ARG ECLOUD_DASHBOARD_JOB_ID="485170"



RUN sed -i 's/23,0,11,1/23,0,11,20/' ${BASE_DIR}/version.php

RUN sed -i 's/23,0,11,1/23,0,11,21/' ${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

+2 −1
Original line number Diff line number Diff line
@@ -34,15 +34,16 @@ if version_greater "$image_version" "$installed_version"; then 
    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 "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-dashboard"

else

    echo "Skipping rsync step as version not updated!"

fi



if [ "$(id -u)" = 0 ]; then

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-dashboard"

else

    sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-dashboard"

fi



/entrypoint.sh "$@"