Merge branch '26.0.8' into 'main' (24ea7250) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+5 −4

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ ARG CONTACTS_JOB_ID="821699"
		ARG CALENDAR_JOB_ID="812355"
		ARG EMAIL_RECOVERY_JOB_ID="738840"
		ARG EA_JOB_ID="738865"
		ARG LAUNCHER_JOB_ID="798389"
		ARG LAUNCHER_JOB_ID="819432"
		ARG GOOGLE_INTEGRATION_VERSION="2.1.0"
		ARG DASHBOARD_JOB_ID="748055"
		ARG SNAPPY_VERSION="2.29.1"
		@@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="608716"
		ARG MEMORIES_VERSION="6.1.5"
		ARG DROP_ACCOUNT_VERSION="2.3.2"

		RUN sed -i 's/26,0,8,2/26,0,8,16/' ${BASE_DIR}/version.php
		RUN sed -i 's/26,0,8,2/26,0,8,23/' ${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
		@@ -130,7 +130,7 @@ 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="1.3.0"
		ARG SELFHOST_THEME_VERSION="1.0.0"
		ARG SELFHOST_THEME_VERSION="2.0.0"
		ARG IS_SELFHOST=true

		# Patches
		@@ -174,13 +174,14 @@ 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 && \
		mv /tmp/selfhost-theme-helper-${SELFHOST_THEME_VERSION}/ ${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