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

Commit 143bd080 authored by Florent VINCENT's avatar Florent VINCENT 👾
Browse files

Merge branch 'nc19.0.10-bundle-email-recovery-app' into 'master'

update nc image to 19.0.10, contact app to 3.5.1 and bundle e email recovery app

See merge request !18
parents 45d31f16 0d8b99a0
Loading
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
FROM nextcloud:19.0.9-fpm
FROM nextcloud:19.0.10-fpm
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_VERSION="19.0.9.3"
ARG NEWS_VERSION="14.2.2"
ARG QUOTA_WARN_VERSION="1.8.0"
ARG NOTES_VERSION="3.6.4"
ARG CONTACTS_VERSION="3.4.3"
ARG CONTACTS_VERSION="3.5.1"
ARG CALENDAR_VERSION="2.0.5"
ARG USER_BACKEND_RAW_SQL_VERSION="1.0.12"
ARG EMAIL_RECOVERY_VERSION="1.0.0"

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/19,0,9,1/19,0,9,3/' ${BASE_DIR}/version.php
RUN sed -i 's/19,0,10,1/19,0,10,2/' ${BASE_DIR}/version.php

# Custom apps
RUN curl -fsSL -o news.tar.gz \
@@ -46,6 +47,11 @@ 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;

RUN curl -fsSL -o email-recovery.tar.gz \
    "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/email-recovery/-/archive/1.0.0/email-recovery-${EMAIL_RECOVERY_VERSION}.tar.gz" && \
    tar -xf email-recovery.tar.gz -C ${BASE_DIR}/custom_apps/ && \
    rm email-recovery.tar.gz;

# Patches
#RUN patch -u ${BASE_DIR}/core/signature.json -i ${TMP_PATCH_DIR}/001-sha512-signature.patch
RUN patch -u ${BASE_DIR}/core/Controller/LoginController.php -i ${TMP_PATCH_DIR}/002-login-without-domain.patch