Merge branch 'dev/nextcloud-24-0-10-snappy' into 'main' (26f4cdbd) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+10 −3

Original line number	Diff line number	Diff line
		@@ -11,9 +11,9 @@ ARG ECLOUD_LAUNCHER_JOB_ID="522867"
		ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
		ARG ECLOUD_DASHBOARD_JOB_ID="525503"
		ARG SNAPPY_VERSION="2.26.3"
		ARG SNAPPY_THEME_VERSION="1.2.2"


		RUN sed -i 's/24,0,10,1/24,0,10,5/' ${BASE_DIR}/version.php
		RUN sed -i 's/24,0,10,1/24,0,10,7/' ${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
		@@ -80,6 +80,14 @@ RUN curl -fsSL -o snappymail.tar.gz \
		tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		rm snappymail.tar.gz;

		# Snappy theme
		RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \
		"https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \
		tar -xf Murena-snappymail-theme.tar.gz -C /tmp/ && \
		mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \
		chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \
		rm -rf Murena-snappymail-theme.tar.gz

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

		@@ -208,4 +216,3 @@ RUN rm -rf ${BASE_DIR}/themes/eCloud && \
		# Seds to fix displayname save regression
		RUN sed -i "s/'email' \|\|/'email'/" ${BASE_DIR}/apps/settings/js/federationsettingsview.js
		RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js