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

Commit 5e26748a authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch '25.0.8' into 'main' 

selfhost -25.0.8

See merge request !184
parents 6d42809c 8c9d0d7d

Dockerfile

+18 −3
Original line number Diff line number Diff line
@@ -10,12 +10,12 @@ ARG EA_JOB_ID="644363" 
ARG LAUNCHER_JOB_ID="616075"

ARG GOOGLE_INTEGRATION_VERSION="1.0.9"

ARG DASHBOARD_JOB_ID="616067"

ARG SNAPPY_VERSION="2.27.2"

ARG SNAPPY_VERSION="2.28.1"

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,9/' ${BASE_DIR}/version.php

RUN sed -i 's/25,0,8,2/25,0,8,16/' ${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
@@ -121,8 +121,10 @@ CMD ["php-fpm"] 
From nextcloud as selfhost

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="selfhost-24.0.10"

ARG THEME_VERSION="25.0.12"

ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"

ARG SELFHOST_THEME_VERSION="1.0.0"

ARG IS_SELFHOST=true



# Patches

COPY patches/ ${TMP_PATCH_DIR}/
@@ -157,6 +159,18 @@ 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 if [ "${IS_SELFHOST}" === "true" ] ; then \

        curl -fsSL -o selfhost-theme-helper.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 /tmp/ && \

        mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \

        chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \

        rm -f selfhost-theme-helper.tar.gz;\

    fi







# 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
@@ -180,6 +194,7 @@ ARG TMP_PATCH_DIR="/tmp/build_patches" 
ARG THEME_VERSION="25.0.12"

ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0"

ARG OIDC_LOGIN_VERSION="2.6.0"

ARG IS_SELFHOST=false



# Patches

COPY patches/ ${TMP_PATCH_DIR}/

custom_entrypoint.sh

+2 −1
Original line number Diff line number Diff line
@@ -29,11 +29,12 @@ if version_greater "$image_version" "$installed_version"; then 
    rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

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

    rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/

    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