Merge branch '19.0.12' into 'master' (cf27ab77) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+24 −7

Original line number	Diff line number	Diff line
		FROM nextcloud:19.0.10-fpm
		FROM nextcloud:19.0.12-fpm
		ARG BASE_DIR="/usr/src/nextcloud"
		ARG TMP_PATCH_DIR="/tmp/build_patches"
		ARG THEME_VERSION="19.0.9.3"
		ARG THEME_VERSION="19.0.9.6"
		ARG NEWS_VERSION="14.2.2"
		ARG QUOTA_WARN_VERSION="1.8.0"
		ARG NOTES_VERSION="3.6.4"
		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"
		ARG EMAIL_RECOVERY_JOB_ID="162557"
		ARG RAINLOOP_VERSION="7.1.0"
		ARG RAINLOOP_COMMIT_SHA="c21dfcab"
		ARG USC_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,10,1/19,0,10,2/' ${BASE_DIR}/version.php
		# RUN sed -i 's/19,0,12,0/19,0,12,1/' ${BASE_DIR}/version.php

		# Install unzip for unzipping artifacts
		RUN apt-get update && apt-get install unzip

		# Custom apps
		RUN curl -fsSL -o news.tar.gz \
		@@ -47,11 +53,21 @@ 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/ && \
		RUN curl -fsSL -o email-recovery.zip \
		"https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/email-recovery/-/jobs/${EMAIL_RECOVERY_JOB_ID}/artifacts/download" && \
		unzip email-recovery.zip && \
		cd dist && tar -xf email-recovery.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		rm email-recovery.tar.gz;

		RUN curl -fsSL -o rainloop.tar.gz \
		"https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}.tar.gz" && \
		tar -xf rainloop.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		mv "${BASE_DIR}/custom_apps/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}" "${BASE_DIR}/custom_apps/rainloop" && \
		rm rainloop.tar.gz;

		# Remove unzip when unzipping is done
		RUN apt-get -y remove unzip

		# Patches
		RUN patch -u ${BASE_DIR}/core/Controller/LoginController.php -i ${TMP_PATCH_DIR}/002-login-without-domain.patch
		RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch
		@@ -66,6 +82,7 @@ RUN rm -rf ${TMP_PATCH_DIR}

		RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js
		RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar.js
		RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/anyof/allof/g' js/calendar.js

		# Custom theme
		RUN curl -fsSL -o eelo-theme.tar.gz \

custom_entrypoint.sh

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@ rsync $rsync_options --include "/quota_warning/" --exclude '/*' $SRC_DIR/custom_
		rsync $rsync_options --include "/calendar/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/contacts/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/user_backend_sql_raw/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/rainloop" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/email-recovery" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

		rsync $rsync_options --include "/eelo/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/