revert google integration to 1.0.9 (ab5a7b07) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+6 −7

Original line number	Diff line number	Diff line
		@@ -8,14 +8,14 @@ ARG CALENDAR_JOB_ID="738789"
		ARG EMAIL_RECOVERY_JOB_ID="738840"
		ARG EA_JOB_ID="738865"
		ARG LAUNCHER_JOB_ID="738816"
		ARG GOOGLE_INTEGRATION_VERSION="2.1.0"
		ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
		ARG DASHBOARD_JOB_ID="748055"
		ARG SNAPPY_VERSION="2.29.1"
		ARG SNAPPY_THEME_VERSION="3.0.0"
		ARG USER_MIGRATION_JOB_ID="608716"
		ARG MEMORIES_VERSION="5.4.1"

		RUN sed -i 's/26,0,8,2/26,0,8,7/' ${BASE_DIR}/version.php
		RUN sed -i 's/26,0,8,2/26,0,8,8/' ${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
		@@ -60,9 +60,8 @@ RUN curl -fsSL -o murena_launcher.zip \
		rm murena_launcher.zip;

		RUN curl -fsSL -o integration_google.tar.gz \
		"https://github.com/nextcloud/integration_google/archive/refs/tags/v${GOOGLE_INTEGRATION_VERSION}.tar.gz" && \
		tar -xf integration_google.tar.gz -C /tmp/ && \
		mv /tmp/integration_google-${GOOGLE_INTEGRATION_VERSION}/ ${BASE_DIR}/custom_apps/integration_google && \
		"https://github.com/nextcloud/integration_google/releases/download/v${GOOGLE_INTEGRATION_VERSION}/integration_google-${GOOGLE_INTEGRATION_VERSION}.tar.gz" && \
		tar -xf integration_google.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		chown -R www-data:www-data ${BASE_DIR}/custom_apps/integration_google && \
		rm integration_google.tar.gz;

		@@ -177,8 +176,8 @@ RUN if [ "$IS_SELFHOST" = true ]; then \
		# 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

		#RUN sed -i 's/ in Nextcloud/ /' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js
		#RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js
		RUN sed -i 's/ in Nextcloud/ /' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js
		RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js


		# Fix the navbar entries