Merge branch 'ignore-os-darkmode' into 'master' (9997dcd0) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+7 −2

Original line number	Diff line number	Diff line
		FROM nextcloud:20.0.12-fpm
		ARG BASE_DIR="/usr/src/nextcloud"
		ARG TMP_PATCH_DIR="/tmp/build_patches"
		ARG THEME_VERSION="20.1.2"
		ARG THEME_VERSION="20.1.3"
		ARG THEME_HELPER_VERSION="1.0.1"
		ARG NEWS_VERSION="16.0.1"
		ARG QUOTA_WARN_VERSION="1.9.1"
		@@ -20,7 +20,7 @@ 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/20,0,12,1/20,0,12,14/' ${BASE_DIR}/version.php
		RUN sed -i 's/20,0,12,1/20,0,12,16/' ${BASE_DIR}/version.php

		# Install unzip for unzipping artifacts
		RUN apt-get update && apt-get install unzip
		@@ -129,6 +129,11 @@ RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE
		# Remove colored background from email template logo
		RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php

		# Ignore OS dark mode for all users
		# Don't use user-specific dark theme css for non-logged in users
		RUN sed -i 's/OCA.Accessibility.theme="dark"/OCA.Accessibility.theme="light"/' ${BASE_DIR}/apps/accessibility/js/accessibilityoca.js
		RUN sed -i "s/$userValues = \['dark'\]/$userValues = \[\]/" ${BASE_DIR}/apps/accessibility/lib/Controller/AccessibilityController.php

		# Custom theme
		RUN curl -fsSL -o eCloud-theme.tar.gz \
		"https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \