Remove few apps from image (366f6793) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+9 −22

Original line number	Diff line number	Diff line
		@@ -2,12 +2,9 @@ FROM nextcloud:24.0.8-fpm AS nextcloud
		ARG BASE_DIR="/usr/src/nextcloud"
		ARG TMP_PATCH_DIR="/tmp/build_patches"
		ARG THEME_HELPER_JOB_ID="446245"
		ARG NEWS_VERSION="19.0.0"
		ARG QUOTA_WARN_VERSION="1.15.0"
		ARG NOTES_VERSION="4.5.1"
		ARG CONTACTS_JOB_ID="400045"
		ARG CALENDAR_JOB_ID="435164"
		ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
		ARG CONTACTS_JOB_ID="471108"
		ARG CALENDAR_JOB_ID="471116"
		ARG EMAIL_RECOVERY_JOB_ID="445958"
		ARG RAINLOOP_VERSION="7.2.5"
		ARG RAINLOOP_COMMIT_SHA="523518ba"
		@@ -23,17 +20,6 @@ RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
		# Install unzip for unzipping artifacts
		RUN apt-get update && apt-get install unzip

		# Custom apps
		RUN curl -fsSL -o news.tar.gz \
		"https://github.com/nextcloud/news/releases/download/${NEWS_VERSION}/news.tar.gz" && \
		tar -xf news.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		rm news.tar.gz;

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

		RUN curl -fsSL -o notes.tar.gz \
		"https://github.com/nextcloud/notes/releases/download/v${NOTES_VERSION}/notes.tar.gz" && \
		tar -xf notes.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		@@ -46,18 +32,12 @@ RUN curl -fsSL -o contacts.zip \
		mv dist/contacts ${BASE_DIR}/custom_apps/ && \
		rm contacts.zip;

		# custom Calendar 3.2.4
		RUN curl -fsSL -o calendar.zip \
		"https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/calendar/-/jobs/${CALENDAR_JOB_ID}/artifacts/download" && \
		unzip calendar.zip && \
		mv dist/calendar ${BASE_DIR}/custom_apps/ && \
		rm calendar.zip;

		RUN curl -fsSL -o user_backend_sql_raw.tar.gz \
		"https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \
		tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		rm user_backend_sql_raw.tar.gz;

		RUN curl -fsSL -o email-recovery.zip \
		"https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/email-recovery/-/jobs/${EMAIL_RECOVERY_JOB_ID}/artifacts/download" && \
		unzip email-recovery.zip && \
		@@ -108,6 +88,7 @@ From nextcloud as selfhost
		ARG BASE_DIR="/usr/src/nextcloud"
		ARG TMP_PATCH_DIR="/tmp/build_patches"
		ARG THEME_VERSION="selfhost-22.0.0"
		ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"

		# Patches
		COPY patches/ ${TMP_PATCH_DIR}/
		@@ -136,6 +117,12 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \
		chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \
		rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/

		# User Backend
		RUN curl -fsSL -o user_backend_sql_raw.tar.gz \
		"https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \
		tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		rm user_backend_sql_raw.tar.gz;

		# 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
		# change notifications icon src

custom_entrypoint.sh

+0 −2

Original line number	Diff line number	Diff line
		@@ -18,9 +18,7 @@ fi
		image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"

		if version_greater "$image_version" "$installed_version"; then
		rsync $rsync_options --include "/news/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/notes/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/quota_warning/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/calendar/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/contacts/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
		rsync $rsync_options --include "/user_backend_sql_raw/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/