new calendar-contact and loginfix (5f11ac53) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+10 −8

Original line number	Diff line number	Diff line
		FROM nextcloud:22.2.8-fpm AS nextcloud
		ARG BASE_DIR="/usr/src/nextcloud"
		ARG TMP_PATCH_DIR="/tmp/build_patches"
		ARG THEME_VERSION="22.1.0"
		ARG THEME_VERSION="22.1.1"
		ARG THEME_HELPER_VERSION="1.3.1"
		ARG NEWS_VERSION="18.0.1"
		ARG QUOTA_WARN_VERSION="1.14.0"
		ARG NOTES_VERSION="4.3.1"
		ARG CONTACTS_VERSION="4.1.1"
		ARG CALENDAR_JOB_ID="321100"
		ARG CONTACTS_JOB_ID="323110"
		ARG CALENDAR_JOB_ID="324817"
		ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1"
		ARG EMAIL_RECOVERY_JOB_ID="313915"
		ARG RAINLOOP_VERSION="7.2.5"
		@@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="318040"
		ARG GOOGLE_INTEGRATION_VERSION="1.0.6"
		ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"

		RUN sed -i 's/22,2,8,1/22,2,8,12/' ${BASE_DIR}/version.php
		RUN sed -i 's/22,2,8,1/22,2,8,13/' ${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
		@@ -40,10 +40,12 @@ RUN curl -fsSL -o notes.tar.gz \
		tar -xf notes.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		rm notes.tar.gz;

		RUN curl -fsSL -o contacts.tar.gz \
		"https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts-v${CONTACTS_VERSION}.tar.gz" && \
		tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		rm contacts.tar.gz;
		# custom Contact
		RUN curl -fsSL -o contacts.zip \
		"https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/contacts/-/jobs/${CONTACTS_JOB_ID}/artifacts/download" && \
		unzip contacts.zip && \
		mv dist/contacts ${BASE_DIR}/custom_apps/ && \
		rm contacts.zip;

		# custom Calendar 3.2.4
		RUN curl -fsSL -o calendar.zip \

custom_entrypoint.sh

+0 −17

Original line number	Diff line number	Diff line
		@@ -37,22 +37,5 @@ else
		echo "Skipping rsync step as version not updated!"
		fi

		if [ "$(id -u)" = 0 ]; then
		su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable apporder"
		su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable murena_launcher"
		su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-theme-helper"
		su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable ecloud_drop_account"
		su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-accounts"
		su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set integrity.check.disabled --value='true' --type=boolean"
		su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set theme --value='eCloud'"
		else
		sh -c "php $DST_DIR/occ app:disable apporder"
		sh -c "php $DST_DIR/occ app:enable ecloud-launcher"
		sh -c "php $DST_DIR/occ app:enable ecloud-theme-helper"
		sh -c "php $DST_DIR/occ app:disable ecloud_drop_account"
		sh -c "php $DST_DIR/occ app:enable ecloud-accounts"
		sh -c "php $DST_DIR/occ config:system:set integrity.check.disabled --value='true' --type=boolean"
		sh -c "php $DST_DIR/occ config:system:set theme --value='eCloud'"
		fi

		/entrypoint.sh "$@"

patches/016-login-screen.patch

+1 −1

File changed.

Contains only whitespace changes.