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

Commit 25976b26 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

login page fix

parent 107e0bba

Dockerfile

+9 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" 
ARG USER_MIGRATION_JOB_ID="608716"

ARG MEMORIES_VERSION="5.1.0"



RUN sed -i 's/25,0,8,2/25,0,8,10/' ${BASE_DIR}/version.php

RUN sed -i 's/25,0,8,2/25,0,8,11/' ${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
@@ -123,6 +123,7 @@ ARG BASE_DIR="/usr/src/nextcloud" 
ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="25.0.12"

ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"

ARG SELFHOST_THEME_VERSION="1.0.0"



# Patches

COPY patches/ ${TMP_PATCH_DIR}/
@@ -157,6 +158,13 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ 
    tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm user_backend_sql_raw.tar.gz;



# Selfhost theme

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

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \

    tar -xf selfhost-theme-helper.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm selfhost-theme-helper.tar.gz;





# Set default class of hidden to settings-hint

RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php

custom_entrypoint.sh

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ if version_greater "$image_version" "$installed_version"; then 
    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/

    rsync $rsync_options --include "/selfhost-theme-helper/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

else

    echo "Skipping rsync step as version not updated!"

fi