diff --git a/Dockerfile b/Dockerfile index 3fa7ae87d1bdf57c0f45eef8e65a30040af53f5b..9fb814a53de587107e971abbab41f4db070021cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ ARG NOTES_VERSION="4.11.0" ARG CONTACTS_JOB_ID="1273569" ARG CALENDAR_JOB_ID="1273554" ARG EMAIL_RECOVERY_JOB_ID="1273659" -ARG EA_JOB_ID="1273772" -ARG LAUNCHER_JOB_ID="1273647" +ARG EA_JOB_ID="1289725" +ARG LAUNCHER_JOB_ID="1290271" ARG GOOGLE_INTEGRATION_VERSION="3.2.0" ARG DASHBOARD_JOB_ID="1273623" ARG SNAPPY_VERSION="2.37.2" @@ -133,7 +133,7 @@ From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="26.0.2" -ARG USER_BACKEND_RAW_SQL_VERSION="2.0.1" +#ARG USER_BACKEND_RAW_SQL_VERSION="2.0.1" ARG SELFHOST_THEME_VERSION="2.0.0" ARG IS_SELFHOST=true @@ -168,10 +168,10 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ # User Backend -RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ - "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/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; +#RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ +# "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/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 if [ "$IS_SELFHOST" = true ]; then \ @@ -236,6 +236,9 @@ RUN rm -rf ${TMP_PATCH_DIR} # Remove user avatar generation for system addressbook card RUN sed -i 's/$this->getAvatarImage($user)/null/' ${BASE_DIR}/apps/dav/lib/CardDAV/Converter.php +# redirect user to sso login on successful resetting password +RUN cd ${BASE_DIR}/dist && sed -i "s|window\.location\.href=(0,g\.Jv)(\"login\")|window.location.href = '/'|g" core-login.js + # show reset pwd page with a query param # RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js