Merge branch 'dev/sed-fix-nextcloud24' into 'main' (0a29d52e) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+5 −5

Original line number	Diff line number	Diff line
		@@ -2,11 +2,11 @@ FROM nextcloud:24.0.8-fpm AS nextcloud
		ARG BASE_DIR="/usr/src/nextcloud"
		ARG TMP_PATCH_DIR="/tmp/build_patches"
		ARG THEME_HELPER_JOB_ID="446245"
		ARG NEWS_VERSION="19.0.0"
		ARG NEWS_VERSION="20.0.0"
		ARG QUOTA_WARN_VERSION="1.15.0"
		ARG NOTES_VERSION="4.5.1"
		ARG CONTACTS_JOB_ID="400045"
		ARG CALENDAR_JOB_ID="435164"
		ARG CONTACTS_JOB_ID="471108"
		ARG CALENDAR_JOB_ID="471116"
		ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
		ARG EMAIL_RECOVERY_JOB_ID="445958"
		ARG RAINLOOP_VERSION="7.2.5"
		@@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="458901"
		ARG GOOGLE_INTEGRATION_VERSION="1.0.8"


		RUN sed -i 's/24,0,8,2/24,0,8,4/' ${BASE_DIR}/version.php
		RUN sed -i 's/24,0,8,2/24,0,8,5/' ${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
		@@ -191,7 +191,7 @@ RUN sed -i 's/(0,zd.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"

		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-main.js
		RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[a,"displayname"\]},//' js/calendar-main.js
		RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[o,"displayname"\]},//' js/calendar-main.js

		# Set default widgets to calendar, tasks and notes
		RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php