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

Commit c768c7c7 authored by Akhil's avatar Akhil 🙂
Browse files

removed sed from entrypoint; added to Dockerfile; bumped version number

parent eb928d5b

Dockerfile

+4 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images 
COPY patches/ ${TMP_PATCH_DIR}/

COPY custom_entrypoint.sh /

RUN chmod +x /custom_entrypoint.sh

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

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



# Install unzip for unzipping artifacts

RUN apt-get update && apt-get install unzip
@@ -75,6 +75,9 @@ RUN curl -fsSL -o ecloud_drop_account.tar.gz \ 
# Remove unzip when unzipping is done

RUN apt-get -y remove unzip



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

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



# Patches

RUN patch -u ${BASE_DIR}/core/Controller/LoginController.php -i ${TMP_PATCH_DIR}/002-login-without-domain.patch

RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch

custom_entrypoint.sh

+1 −15
Original line number Diff line number Diff line
@@ -31,19 +31,5 @@ if version_greater "$image_version" "$installed_version"; then 
else

    echo "Skipping rsync step as version not updated!"

fi

# 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 "$@"
 
 No newline at end of file
 


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

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

        su -p www-data -s /bin/sh -c "php /var/www/html/occ config:system:set theme --value eelo"

        su -p www-data -s /bin/sh -c "php /var/www/html/occ maintenance:theme:update"

    else

        sh -c "php /var/www/html/occ config:system:set theme --value eelo"

        sh -c "php /var/www/html/occ maintenance:theme:update"

    fi





echo "NC ready!"