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

Commit 9bdd7ab4 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'dev/nc-30-0-14' into 'main' 

Dev/nc 30 0 14

See merge request !266
parents 4160bb1a 332c9cf9

Dockerfile

+34 −31
Original line number Diff line number Diff line 
FROM nextcloud:30.0.13-fpm AS nextcloud

FROM nextcloud:30.0.14-fpm AS nextcloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_HELPER_JOB_ID="1273671"

ARG THEME_HELPER_JOB_ID="1313213"

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 CONTACTS_JOB_ID="1313223"

ARG CALENDAR_JOB_ID="1313255"

ARG EMAIL_RECOVERY_JOB_ID="1313239"

ARG EA_JOB_ID="1289726"

ARG LAUNCHER_JOB_ID="1313268"

ARG GOOGLE_INTEGRATION_VERSION="3.2.0"

ARG DASHBOARD_JOB_ID="1273623"

ARG DASHBOARD_JOB_ID="1313279"

ARG SNAPPY_VERSION="2.37.2"

ARG SNAPPY_THEME_VERSION="4.0.4"

ARG USER_MIGRATION_JOB_ID="1273698"

ARG USER_MIGRATION_JOB_ID="1313296"

ARG MEMORIES_VERSION="7.5.2"

ARG DROP_ACCOUNT_VERSION="2.7.1"



RUN sed -i 's/30,0,13,1/30,0,13,8/' ${BASE_DIR}/version.php

RUN sed -i 's/30,0,14,1/30,0,14,4/' ${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
@@ -78,10 +78,10 @@ RUN curl -fsSL -o ecloud-dashboard.zip \ 
  mv dist/murena-dashboard ${BASE_DIR}/custom_apps/ && \

  rm ecloud-dashboard.zip;



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

  "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \

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

  rm snappymail.tar.gz;

#RUN curl -fsSL -o snappymail.tar.gz \

#  "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \

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

#  rm snappymail.tar.gz;



RUN curl -fsSL -o user_migration.zip \

  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/user_migration/-/jobs/${USER_MIGRATION_JOB_ID}/artifacts/download" && \
@@ -90,19 +90,19 @@ RUN curl -fsSL -o user_migration.zip \ 
  rm user_migration.zip;



# Fix snappymail icon

RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml

#RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml



# Hide personal settings of snappymail

RUN sed -i "s/'additional'/null/" ${BASE_DIR}/custom_apps/snappymail/lib/Settings/PersonalSettings.php

#RUN sed -i "s/'additional'/null/" ${BASE_DIR}/custom_apps/snappymail/lib/Settings/PersonalSettings.php



# Snappy theme

RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \

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

  tar -xf Murena-snappymail-theme.tar.gz -C /tmp/ && \

  mkdir -p ${BASE_DIR}/themes/Murena && \

  mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena/snappymail && \

  chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \

  rm -rf Murena-snappymail-theme.tar.gz

#RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \

#  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \

#  tar -xf Murena-snappymail-theme.tar.gz -C /tmp/ && \

#  mkdir -p ${BASE_DIR}/themes/Murena && \

#  mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena/snappymail && \

#  chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \

#  rm -rf Murena-snappymail-theme.tar.gz



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

  "https://github.com/pulsejet/memories/releases/download/v${MEMORIES_VERSION}/memories.tar.gz" && \
@@ -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 \
@@ -206,8 +206,8 @@ RUN sed -i "s/ajax\/getstoragestats/api\/v1\/stats/g" ${BASE_DIR}/apps/files/js/ 
From selfhost as ecloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="29.0.16"

ARG LDAP_WRITE_SUPPORT_VERSION="1.11.1"

ARG THEME_VERSION="30.0.0"

ARG LDAP_WRITE_SUPPORT_VERSION="1.12.1"

ARG IS_SELFHOST=false



RUN curl -fsSL -o ldap_write_support.tar.gz \
@@ -236,11 +236,14 @@ 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



# add attr about how many notifications to notif icon

RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-atbzHwwu.chunk.mjs

RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-DS2Cdf60.chunk.mjs



# Rename Memories to Gallery

RUN sed -i 's/<name>Memories<\/name>/<name>Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml

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 "/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 "/drop_account/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/user_migration/" --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!"