Merge branch 'ldap-write-support' into 'LDAP-migration' (aa6e2103) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+10 −1

Original line number	Diff line number	Diff line
		@@ -15,8 +15,9 @@ ARG RAINLOOP_COMMIT_SHA="523518ba"
		ARG EA_TAG="2.0.0-beta.1"
		ARG ECLOUD_LAUNCHER_JOB_ID="294845"
		ARG GOOGLE_INTEGRATION_VERSION="1.0.6"
		ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"

		RUN sed -i 's/22,2,7,1/22,2,7,11/' ${BASE_DIR}/version.php
		RUN sed -i 's/22,2,7,1/22,2,7,12/' ${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
		@@ -93,6 +94,11 @@ RUN curl -fsSL -o ecloud-accounts.tar.gz \
		mv "${BASE_DIR}/custom_apps/ecloud-drop-account-${EA_TAG}" "${BASE_DIR}/custom_apps/ecloud-accounts" && \
		rm ecloud-accounts.tar.gz;

		RUN curl -fsSL -o ldap_write_support.tar.gz \
		"https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \
		tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \
		rm ldap_write_support.tar.gz

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

		@@ -134,6 +140,9 @@ RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->
		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

		# Remove changeAvatar in changeUserHook of ldap_write_support as it throws errors
		RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_apps/ldap_write_support/lib/LDAPUserManager.php

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

custom_entrypoint.sh

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ if version_greater "$image_version" "$installed_version"; then
		rsync $rsync_options --include "/ecloud-theme-helper/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/ecloud-launcher/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

		rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/
		else