From 28c3074c0594dbe997063004d29b167e0d74fa1a Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 16:11:39 +0530
Subject: [PATCH 01/35] create reversed patches

---
 Dockerfile.selfhost                           | 19 ++++++++++
 .../003-contact-search-removal.patch          | 16 ++++++++
 ...04-contact-search-controller-removal.patch | 23 ++++++++++++
 .../005-autocomplete-user-leak-core.patch     | 36 ++++++++++++++++++
 ...05-autocomplete-user-leak-custom-app.patch | 12 ++++++
 .../010-disable-app-store-upgrade.patch       | 15 ++++++++
 reversed-patches/011-privacy-settings.patch   | 37 +++++++++++++++++++
 .../012-remove-user-status-widget.patch       | 12 ++++++
 8 files changed, 170 insertions(+)
 create mode 100644 Dockerfile.selfhost
 create mode 100644 reversed-patches/003-contact-search-removal.patch
 create mode 100644 reversed-patches/004-contact-search-controller-removal.patch
 create mode 100644 reversed-patches/005-autocomplete-user-leak-core.patch
 create mode 100644 reversed-patches/005-autocomplete-user-leak-custom-app.patch
 create mode 100644 reversed-patches/010-disable-app-store-upgrade.patch
 create mode 100644 reversed-patches/011-privacy-settings.patch
 create mode 100644 reversed-patches/012-remove-user-status-widget.patch

diff --git a/Dockerfile.selfhost b/Dockerfile.selfhost
new file mode 100644
index 00000000..8a997672
--- /dev/null
+++ b/Dockerfile.selfhost
@@ -0,0 +1,19 @@
+FROM registry.gitlab.e.foundation/e/infra/ecloud/nextcloud:selfhost-privacy
+ARG TMP_PATCH_DIR="/tmp/build_patches"
+ARG BASE_DIR="/usr/src/nextcloud"
+
+COPY ./reversed-patches ${TMP_PATCH_DIR}/
+
+RUN ls -la ${TMP_PATCH_DIR}
+
+
+RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch
+RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch
+RUN cd ${BASE_DIR} && patch --merge ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch
+RUN cd ${BASE_DIR}/custom_apps && patch --merge ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch
+
+RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch
+
+RUN cd ${BASE_DIR} && patch --merge ${TMP_PATCH_DIR}/011-privacy-settings.patch
+RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch
+RUN rm -rf ${TMP_PATCH_DIR}
diff --git a/reversed-patches/003-contact-search-removal.patch b/reversed-patches/003-contact-search-removal.patch
new file mode 100644
index 00000000..6c011d39
--- /dev/null
+++ b/reversed-patches/003-contact-search-removal.patch
@@ -0,0 +1,16 @@
+--- layout.user.php-new	2021-06-22 14:07:45.938569109 +0530
++++ layout.user.php	2021-06-22 14:06:34.786843164 +0530
+@@ -103,6 +103,14 @@
+ 			<div class="header-right">
+ 				<div id="unified-search"></div>
++				<div id="contactsmenu">
++					<div class="icon-contacts menutoggle" tabindex="0" role="button"
++					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
++						<span class="hidden-visually"><?php p($l->t('Contacts'));?></span>
++					</div>
++					<div id="contactsmenu-menu" class="menu"
++						aria-label="<?php p($l->t('Contacts menu'));?>"></div>
++				</div>
+ 				<div id="settings">
+ 					<div id="expand" tabindex="0" role="button" class="menutoggle"
+ 						aria-label="<?php p($l->t('Settings'));?>"
diff --git a/reversed-patches/004-contact-search-controller-removal.patch b/reversed-patches/004-contact-search-controller-removal.patch
new file mode 100644
index 00000000..62e9bc63
--- /dev/null
+++ b/reversed-patches/004-contact-search-controller-removal.patch
@@ -0,0 +1,23 @@
+--- ContactsMenuController-new.php	2021-02-04 10:30:13.000000000 +0100
++++ ContactsMenuController.php	2021-02-04 10:20:18.000000000 +0100
+@@ -58,7 +58,7 @@
+ 	 * @return \JsonSerializable[]
+ 	 */
+ 	public function index($filter = null) {
++		return $this->manager->getEntries($this->userSession->getUser(), $filter);
+-		return [];
+ 	}
+ 
+ 	/**
+@@ -69,6 +69,11 @@
+ 	 * @return JSONResponse|\JsonSerializable
+ 	 */
+ 	public function findOne($shareType, $shareWith) {
++		$contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);
++
++		if ($contact) {
++			return $contact;
++		}
+ 		return new JSONResponse([], Http::STATUS_NOT_FOUND);
+ 	}
+ }
diff --git a/reversed-patches/005-autocomplete-user-leak-core.patch b/reversed-patches/005-autocomplete-user-leak-core.patch
new file mode 100644
index 00000000..23be158d
--- /dev/null
+++ b/reversed-patches/005-autocomplete-user-leak-core.patch
@@ -0,0 +1,36 @@
+--- lib/private/Collaboration/Collaborators/UserPlugin-new.php	2021-02-16 14:56:26.778152834 +0100
++++ lib/private/Collaboration/Collaborators/UserPlugin.php	2021-01-25 15:56:05.000000000 +0100
+@@ -114,7 +114,7 @@
+ 			$uid = (string) $uid;
+ 			if (
+ 				$lowerSearch !== '' && (strtolower($uid) === $lowerSearch ||
++				strtolower($userDisplayName) === $lowerSearch ||
+-//				strtolower($userDisplayName) === $lowerSearch ||
+ 				strtolower($userEmail) === $lowerSearch)
+ 			) {
+ 				if (strtolower($uid) === $lowerSearch) {
+--- lib/private/Collaboration/Collaborators/MailPlugin-new.php	2021-06-22 14:56:31.201379020 +0530
++++ lib/private/Collaboration/Collaborators/MailPlugin.php	2021-06-22 14:53:24.451402977 +0530
+@@ -36,7 +36,6 @@
+ use OCP\IConfig;
+ use OCP\IGroupManager;
+ use OCP\IUser;
+-use OCP\IUserManager;
+ use OCP\IUserSession;
+ use OCP\Share\IShare;
+ 
+@@ -57,13 +56,12 @@
+ 	/** @var IUserSession */
+ 	private $userSession;
+ 
++	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IGroupManager $groupManager, IUserSession $userSession) {
+-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IGroupManager $groupManager, IUserSession $userSession, IUserManager $userManager) {
+ 		$this->contactsManager = $contactsManager;
+ 		$this->cloudIdManager = $cloudIdManager;
+ 		$this->config = $config;
+ 		$this->groupManager = $groupManager;
+-       $this->userManager = $userManager;
+ 
+ 		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+ 		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+ 						if ($exactEmailMatch) {
diff --git a/reversed-patches/005-autocomplete-user-leak-custom-app.patch b/reversed-patches/005-autocomplete-user-leak-custom-app.patch
new file mode 100644
index 00000000..4e647b4b
--- /dev/null
+++ b/reversed-patches/005-autocomplete-user-leak-custom-app.patch
@@ -0,0 +1,12 @@
+--- user_backend_sql_raw/lib/UserBackend-new.php	2021-03-02 15:43:12.615868478 +0100
++++ user_backend_sql_raw/lib/UserBackend.php	2020-10-06 01:56:49.000000000 +0200
+@@ -108,8 +108,7 @@
+ 		// Because MariaDB can not handle string parameters for LIMIT/OFFSET we have to bind the
+ 		// values "manually" instead of passing an array to execute(). This is another instance of
+ 		// MariaDB making the code "uglier".
++		$statement->bindValue(':search', '%' . $searchString . '%', \PDO::PARAM_STR);
+-		$statement->bindValue(':search', $searchString , \PDO::PARAM_STR);
+-
+ 		if (isset($limit)) {
+ 			$statement->bindValue(':limit', intval($limit), \PDO::PARAM_INT);
+ 		}
\ No newline at end of file
diff --git a/reversed-patches/010-disable-app-store-upgrade.patch b/reversed-patches/010-disable-app-store-upgrade.patch
new file mode 100644
index 00000000..b366606a
--- /dev/null
+++ b/reversed-patches/010-disable-app-store-upgrade.patch
@@ -0,0 +1,15 @@
+--- ./lib/private/Updater-new.php	2021-08-11 19:46:15.173946740 +0530
++++ ./lib/private/Updater.php	2021-08-11 19:46:04.607195791 +0530
+@@ -261,9 +261,9 @@
+ 		\OC::$server->getAppFetcher()->setVersion($currentVersion);
+ 
+ 		// upgrade appstore apps
++		$this->upgradeAppStoreApps(\OC::$server->getAppManager()->getInstalledApps());
++		$autoDisabledApps = \OC::$server->getAppManager()->getAutoDisabledApps();
++		$this->upgradeAppStoreApps($autoDisabledApps, true);
+-		//$this->upgradeAppStoreApps(\OC::$server->getAppManager()->getInstalledApps());
+-		//$autoDisabledApps = \OC::$server->getAppManager()->getAutoDisabledApps();
+-		//$this->upgradeAppStoreApps($autoDisabledApps, true);
+ 
+ 		// install new shipped apps on upgrade
+ 		$errors = Installer::installShippedApps(true);
diff --git a/reversed-patches/011-privacy-settings.patch b/reversed-patches/011-privacy-settings.patch
new file mode 100644
index 00000000..a94e9b70
--- /dev/null
+++ b/reversed-patches/011-privacy-settings.patch
@@ -0,0 +1,37 @@
+--- ./apps/privacy/lib/Settings/MissionSettings-new.php	2021-09-07 17:40:30.078256502 +0530
++++ ./apps/privacy/lib/Settings/MissionSettings.php	2021-09-07 17:38:08.650902445 +0530
+@@ -41,8 +41,8 @@
+ 	/**
+ 	 * @return string
+ 	 */
++	public function getSection():string {
++		return 'privacy';
+-	public function getSection() {
+-		return null;
+ 	}
+ 
+ 	/**
+--- ./apps/privacy/lib/Settings/UserDataManifestoSettings-new.php	2021-09-07 17:40:42.288315736 +0530
++++ ./apps/privacy/lib/Settings/UserDataManifestoSettings.php	2021-09-07 17:38:06.284224253 +0530
+@@ -41,8 +41,8 @@
+ 	/**
+ 	 * @return string
+ 	 */
++	public function getSection():string {
++		return 'privacy';
+-	public function getSection() {
+-		return null;
+ 	}
+ 
+ 	/**
+--- ./apps/privacy/templates/who-has-access-new.php	2021-09-07 17:40:02.714790363 +0530
++++ ./apps/privacy/templates/who-has-access.php	2021-09-07 17:40:05.704804878 +0530
+@@ -1,8 +1,3 @@
+-<?php
+-script('privacy', 'privacy');
+-style('privacy', 'privacy');
+-?>
+-
+ <div id="themes" class="section">
+ 	<h3><?php p($l->t('Who has access to your data?')) ?></h3>
+ 	<h4><?php p($l->t('Administrators')); ?></h4>
diff --git a/reversed-patches/012-remove-user-status-widget.patch b/reversed-patches/012-remove-user-status-widget.patch
new file mode 100644
index 00000000..f0fce778
--- /dev/null
+++ b/reversed-patches/012-remove-user-status-widget.patch
@@ -0,0 +1,12 @@
+--- DashboardController-new.php	2021-09-17 12:59:18.906502554 +0530
++++ DashboardController.php	2021-09-17 12:56:19.691685082 +0530
+@@ -108,9 +108,6 @@
+ 				'url' => $widget->getUrl()
+ 			];
+ 		}, $this->dashboardManager->getWidgets());
+-                $widgets = array_filter($widgets, function($widget) {
+-                        return($widget['id'] !== "user_status");
+-                });
+ 		$configStatuses = $this->config->getUserValue($this->userId, 'dashboard', 'statuses', '');
+ 		$statuses = json_decode($configStatuses, true);
+ 		// We avoid getting an empty array as it will not produce an object in UI's JS
-- 
GitLab


From 74105c13f6775fa494a8b19fb4537dff8f73bbd4 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 19:00:59 +0530
Subject: [PATCH 02/35] use target based Dockerfile

---
 Dockerfile                                    | 70 +++++++++++--------
 Dockerfile.selfhost                           | 19 -----
 .../003-contact-search-removal.patch          | 16 -----
 ...04-contact-search-controller-removal.patch | 23 ------
 .../005-autocomplete-user-leak-core.patch     | 36 ----------
 ...05-autocomplete-user-leak-custom-app.patch | 12 ----
 .../010-disable-app-store-upgrade.patch       | 15 ----
 reversed-patches/011-privacy-settings.patch   | 37 ----------
 .../012-remove-user-status-widget.patch       | 12 ----
 9 files changed, 42 insertions(+), 198 deletions(-)
 delete mode 100644 Dockerfile.selfhost
 delete mode 100644 reversed-patches/003-contact-search-removal.patch
 delete mode 100644 reversed-patches/004-contact-search-controller-removal.patch
 delete mode 100644 reversed-patches/005-autocomplete-user-leak-core.patch
 delete mode 100644 reversed-patches/005-autocomplete-user-leak-custom-app.patch
 delete mode 100644 reversed-patches/010-disable-app-store-upgrade.patch
 delete mode 100644 reversed-patches/011-privacy-settings.patch
 delete mode 100644 reversed-patches/012-remove-user-status-widget.patch

diff --git a/Dockerfile b/Dockerfile
index 1a9b332b..39267b5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
-FROM nextcloud:20.0.12-fpm
+FROM nextcloud:20.0.12-fpm as base
 ARG BASE_DIR="/usr/src/nextcloud"
-ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_VERSION="20.1.3"
 ARG THEME_HELPER_VERSION="1.0.1"
 ARG NEWS_VERSION="16.0.1"
@@ -17,7 +16,6 @@ ARG ECLOUD_LAUNCHER_JOB_ID="204816"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.5-1-nightly"
 
 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,16/' ${BASE_DIR}/version.php
@@ -101,31 +99,6 @@ RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('t
 # fix min version of google data migration app
 RUN sed -i "s/min-version=\"22\"/min-version=\"20\"/" ${BASE_DIR}/custom_apps/integration_google/appinfo/info.xml
 
-# Patches
-RUN patch -u ${BASE_DIR}/core/Controller/LoginController.php -i ${TMP_PATCH_DIR}/002-login-without-domain.patch
-RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch
-RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch
-RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch
-RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch
-RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.patch
-RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/007-remove-dev-notice.patch
-RUN patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR}/008-icons-cacher-theme-svgs.patch
-RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/008-svg-controller-theme-svgs.patch
-RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch
-RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch
-RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch
-RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch
-RUN rm -rf ${TMP_PATCH_DIR}
-
-# autocomplete leak tweak apps frontend with sed, disable group suggestion
-
-RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js
-RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar.js
-RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/anyof/allof/g' js/calendar.js
-
-# Set default widgets to calendar, tasks and notes
-RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php
-
 # 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
 
@@ -147,3 +120,44 @@ RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/<?php p
 
 ENTRYPOINT ["/custom_entrypoint.sh"]
 CMD ["php-fpm"]
+
+
+FROM base as selfhost
+ARG BASE_DIR="/usr/src/nextcloud"
+ARG TMP_PATCH_DIR="/tmp/build_patches"
+
+COPY patches/ ${TMP_PATCH_DIR}/
+
+# Patches
+RUN patch -u ${BASE_DIR}/core/Controller/LoginController.php -i ${TMP_PATCH_DIR}/002-login-without-domain.patch
+RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.patch
+RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/007-remove-dev-notice.patch
+RUN patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR}/008-icons-cacher-theme-svgs.patch
+RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/008-svg-controller-theme-svgs.patch
+RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch
+RUN rm -rf ${TMP_PATCH_DIR}
+
+FROM selfhost as selfhost-privacy
+ARG BASE_DIR="/usr/src/nextcloud"
+ARG TMP_PATCH_DIR="/tmp/build_patches"
+
+COPY patches/ ${TMP_PATCH_DIR}/
+
+# Privacy specific patches
+RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch
+RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch
+RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch
+RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch
+RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch
+RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch
+RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch
+
+# autocomplete leak tweak apps frontend with sed, disable group suggestion
+
+RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js
+RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar.js
+RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/anyof/allof/g' js/calendar.js
+
+# Set default widgets to calendar, tasks and notes
+RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php
+RUN rm -rf ${TMP_PATCH_DIR}
diff --git a/Dockerfile.selfhost b/Dockerfile.selfhost
deleted file mode 100644
index 8a997672..00000000
--- a/Dockerfile.selfhost
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM registry.gitlab.e.foundation/e/infra/ecloud/nextcloud:selfhost-privacy
-ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG BASE_DIR="/usr/src/nextcloud"
-
-COPY ./reversed-patches ${TMP_PATCH_DIR}/
-
-RUN ls -la ${TMP_PATCH_DIR}
-
-
-RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch
-RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch
-RUN cd ${BASE_DIR} && patch --merge ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch
-RUN cd ${BASE_DIR}/custom_apps && patch --merge ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch
-
-RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch
-
-RUN cd ${BASE_DIR} && patch --merge ${TMP_PATCH_DIR}/011-privacy-settings.patch
-RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch
-RUN rm -rf ${TMP_PATCH_DIR}
diff --git a/reversed-patches/003-contact-search-removal.patch b/reversed-patches/003-contact-search-removal.patch
deleted file mode 100644
index 6c011d39..00000000
--- a/reversed-patches/003-contact-search-removal.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- layout.user.php-new	2021-06-22 14:07:45.938569109 +0530
-+++ layout.user.php	2021-06-22 14:06:34.786843164 +0530
-@@ -103,6 +103,14 @@
- 			<div class="header-right">
- 				<div id="unified-search"></div>
-+				<div id="contactsmenu">
-+					<div class="icon-contacts menutoggle" tabindex="0" role="button"
-+					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
-+						<span class="hidden-visually"><?php p($l->t('Contacts'));?></span>
-+					</div>
-+					<div id="contactsmenu-menu" class="menu"
-+						aria-label="<?php p($l->t('Contacts menu'));?>"></div>
-+				</div>
- 				<div id="settings">
- 					<div id="expand" tabindex="0" role="button" class="menutoggle"
- 						aria-label="<?php p($l->t('Settings'));?>"
diff --git a/reversed-patches/004-contact-search-controller-removal.patch b/reversed-patches/004-contact-search-controller-removal.patch
deleted file mode 100644
index 62e9bc63..00000000
--- a/reversed-patches/004-contact-search-controller-removal.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ContactsMenuController-new.php	2021-02-04 10:30:13.000000000 +0100
-+++ ContactsMenuController.php	2021-02-04 10:20:18.000000000 +0100
-@@ -58,7 +58,7 @@
- 	 * @return \JsonSerializable[]
- 	 */
- 	public function index($filter = null) {
-+		return $this->manager->getEntries($this->userSession->getUser(), $filter);
--		return [];
- 	}
- 
- 	/**
-@@ -69,6 +69,11 @@
- 	 * @return JSONResponse|\JsonSerializable
- 	 */
- 	public function findOne($shareType, $shareWith) {
-+		$contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);
-+
-+		if ($contact) {
-+			return $contact;
-+		}
- 		return new JSONResponse([], Http::STATUS_NOT_FOUND);
- 	}
- }
diff --git a/reversed-patches/005-autocomplete-user-leak-core.patch b/reversed-patches/005-autocomplete-user-leak-core.patch
deleted file mode 100644
index 23be158d..00000000
--- a/reversed-patches/005-autocomplete-user-leak-core.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- lib/private/Collaboration/Collaborators/UserPlugin-new.php	2021-02-16 14:56:26.778152834 +0100
-+++ lib/private/Collaboration/Collaborators/UserPlugin.php	2021-01-25 15:56:05.000000000 +0100
-@@ -114,7 +114,7 @@
- 			$uid = (string) $uid;
- 			if (
- 				$lowerSearch !== '' && (strtolower($uid) === $lowerSearch ||
-+				strtolower($userDisplayName) === $lowerSearch ||
--//				strtolower($userDisplayName) === $lowerSearch ||
- 				strtolower($userEmail) === $lowerSearch)
- 			) {
- 				if (strtolower($uid) === $lowerSearch) {
---- lib/private/Collaboration/Collaborators/MailPlugin-new.php	2021-06-22 14:56:31.201379020 +0530
-+++ lib/private/Collaboration/Collaborators/MailPlugin.php	2021-06-22 14:53:24.451402977 +0530
-@@ -36,7 +36,6 @@
- use OCP\IConfig;
- use OCP\IGroupManager;
- use OCP\IUser;
--use OCP\IUserManager;
- use OCP\IUserSession;
- use OCP\Share\IShare;
- 
-@@ -57,13 +56,12 @@
- 	/** @var IUserSession */
- 	private $userSession;
- 
-+	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IGroupManager $groupManager, IUserSession $userSession) {
--	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IGroupManager $groupManager, IUserSession $userSession, IUserManager $userManager) {
- 		$this->contactsManager = $contactsManager;
- 		$this->cloudIdManager = $cloudIdManager;
- 		$this->config = $config;
- 		$this->groupManager = $groupManager;
--       $this->userManager = $userManager;
- 
- 		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
- 		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
- 						if ($exactEmailMatch) {
diff --git a/reversed-patches/005-autocomplete-user-leak-custom-app.patch b/reversed-patches/005-autocomplete-user-leak-custom-app.patch
deleted file mode 100644
index 4e647b4b..00000000
--- a/reversed-patches/005-autocomplete-user-leak-custom-app.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- user_backend_sql_raw/lib/UserBackend-new.php	2021-03-02 15:43:12.615868478 +0100
-+++ user_backend_sql_raw/lib/UserBackend.php	2020-10-06 01:56:49.000000000 +0200
-@@ -108,8 +108,7 @@
- 		// Because MariaDB can not handle string parameters for LIMIT/OFFSET we have to bind the
- 		// values "manually" instead of passing an array to execute(). This is another instance of
- 		// MariaDB making the code "uglier".
-+		$statement->bindValue(':search', '%' . $searchString . '%', \PDO::PARAM_STR);
--		$statement->bindValue(':search', $searchString , \PDO::PARAM_STR);
--
- 		if (isset($limit)) {
- 			$statement->bindValue(':limit', intval($limit), \PDO::PARAM_INT);
- 		}
\ No newline at end of file
diff --git a/reversed-patches/010-disable-app-store-upgrade.patch b/reversed-patches/010-disable-app-store-upgrade.patch
deleted file mode 100644
index b366606a..00000000
--- a/reversed-patches/010-disable-app-store-upgrade.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./lib/private/Updater-new.php	2021-08-11 19:46:15.173946740 +0530
-+++ ./lib/private/Updater.php	2021-08-11 19:46:04.607195791 +0530
-@@ -261,9 +261,9 @@
- 		\OC::$server->getAppFetcher()->setVersion($currentVersion);
- 
- 		// upgrade appstore apps
-+		$this->upgradeAppStoreApps(\OC::$server->getAppManager()->getInstalledApps());
-+		$autoDisabledApps = \OC::$server->getAppManager()->getAutoDisabledApps();
-+		$this->upgradeAppStoreApps($autoDisabledApps, true);
--		//$this->upgradeAppStoreApps(\OC::$server->getAppManager()->getInstalledApps());
--		//$autoDisabledApps = \OC::$server->getAppManager()->getAutoDisabledApps();
--		//$this->upgradeAppStoreApps($autoDisabledApps, true);
- 
- 		// install new shipped apps on upgrade
- 		$errors = Installer::installShippedApps(true);
diff --git a/reversed-patches/011-privacy-settings.patch b/reversed-patches/011-privacy-settings.patch
deleted file mode 100644
index a94e9b70..00000000
--- a/reversed-patches/011-privacy-settings.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./apps/privacy/lib/Settings/MissionSettings-new.php	2021-09-07 17:40:30.078256502 +0530
-+++ ./apps/privacy/lib/Settings/MissionSettings.php	2021-09-07 17:38:08.650902445 +0530
-@@ -41,8 +41,8 @@
- 	/**
- 	 * @return string
- 	 */
-+	public function getSection():string {
-+		return 'privacy';
--	public function getSection() {
--		return null;
- 	}
- 
- 	/**
---- ./apps/privacy/lib/Settings/UserDataManifestoSettings-new.php	2021-09-07 17:40:42.288315736 +0530
-+++ ./apps/privacy/lib/Settings/UserDataManifestoSettings.php	2021-09-07 17:38:06.284224253 +0530
-@@ -41,8 +41,8 @@
- 	/**
- 	 * @return string
- 	 */
-+	public function getSection():string {
-+		return 'privacy';
--	public function getSection() {
--		return null;
- 	}
- 
- 	/**
---- ./apps/privacy/templates/who-has-access-new.php	2021-09-07 17:40:02.714790363 +0530
-+++ ./apps/privacy/templates/who-has-access.php	2021-09-07 17:40:05.704804878 +0530
-@@ -1,8 +1,3 @@
--<?php
--script('privacy', 'privacy');
--style('privacy', 'privacy');
--?>
--
- <div id="themes" class="section">
- 	<h3><?php p($l->t('Who has access to your data?')) ?></h3>
- 	<h4><?php p($l->t('Administrators')); ?></h4>
diff --git a/reversed-patches/012-remove-user-status-widget.patch b/reversed-patches/012-remove-user-status-widget.patch
deleted file mode 100644
index f0fce778..00000000
--- a/reversed-patches/012-remove-user-status-widget.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- DashboardController-new.php	2021-09-17 12:59:18.906502554 +0530
-+++ DashboardController.php	2021-09-17 12:56:19.691685082 +0530
-@@ -108,9 +108,6 @@
- 				'url' => $widget->getUrl()
- 			];
- 		}, $this->dashboardManager->getWidgets());
--                $widgets = array_filter($widgets, function($widget) {
--                        return($widget['id'] !== "user_status");
--                });
- 		$configStatuses = $this->config->getUserValue($this->userId, 'dashboard', 'statuses', '');
- 		$statuses = json_decode($configStatuses, true);
- 		// We avoid getting an empty array as it will not produce an object in UI's JS
-- 
GitLab


From 6e43f31b7bd1f447b79b6d801bc6ea9de6dde990 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 19:35:25 +0530
Subject: [PATCH 03/35] add target in gitlab ci

---
 .gitlab-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e9fa46e..07870566 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,13 @@ build-branch:
 build-tag:
   only:
     - tags
+  variables:
+    TARGET: "selfhost-privacy"
+  rules:
+    - if: $CI_COMMIT_TAG == "selfhost"
+      variables:
+        TARGET: "selfhost"
   stage: build
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
+    - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-- 
GitLab


From 4a966dedf13bf36370d8f1243bc96a7ccc0ffc0a Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 19:47:32 +0530
Subject: [PATCH 04/35] fix if statement

---
 .gitlab-ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07870566..8d91aa75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,11 +28,8 @@ build-tag:
     - tags
   variables:
     TARGET: "selfhost-privacy"
-  rules:
-    - if: $CI_COMMIT_TAG == "selfhost"
-      variables:
-        TARGET: "selfhost"
   stage: build
   script:
+    - if [ "$CI_COMMIT_TAG" == "selfhost" ]; then export TARGET="selfhost" fi
     - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-- 
GitLab


From 4bdd639f2355c16c11789a865690e7555425604b Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 19:48:35 +0530
Subject: [PATCH 05/35] add ; in if statement

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d91aa75..118ad821 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,6 @@ build-tag:
     TARGET: "selfhost-privacy"
   stage: build
   script:
-    - if [ "$CI_COMMIT_TAG" == "selfhost" ]; then export TARGET="selfhost" fi
+    - if [ "$CI_COMMIT_TAG" == "selfhost" ]; then export TARGET="selfhost"; fi
     - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-- 
GitLab


From f5c3d60e8c3d1cd1be623d08b08f66a4127abaaa Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 19:52:08 +0530
Subject: [PATCH 06/35] test with current branch

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 118ad821..2ebcad95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,8 +18,11 @@ default:
 build-branch:
   except:
     - tags
+  variables:
+    TARGET: "selfhost-privacy"
   stage: build
   script:
+    - if [ "$CI_COMMIT_REF_SLUG" == "selfhost-tag" ]; then export TARGET="selfhost"; fi
     - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
 
-- 
GitLab


From 202ec188088db43eeae64604ecd5cfa5e6070a37 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 19:53:26 +0530
Subject: [PATCH 07/35] add target in build:branch

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ebcad95..3b72e663 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ build-branch:
   stage: build
   script:
     - if [ "$CI_COMMIT_REF_SLUG" == "selfhost-tag" ]; then export TARGET="selfhost"; fi
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
 
 build-tag:
-- 
GitLab


From e98e97b46ec95b19e176bbbb5c30d096cd747431 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Thu, 11 Nov 2021 09:22:57 +0530
Subject: [PATCH 08/35] remove selfhost-tag in branch build

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b72e663..ea5576fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,6 @@ build-branch:
     TARGET: "selfhost-privacy"
   stage: build
   script:
-    - if [ "$CI_COMMIT_REF_SLUG" == "selfhost-tag" ]; then export TARGET="selfhost"; fi
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
 
-- 
GitLab


From 7ac001ad7818730fbafc46516f7392990adb612e Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Thu, 11 Nov 2021 20:15:34 +0530
Subject: [PATCH 09/35] add rules to target ecloud

---
 .gitlab-ci.yml | 26 +++++++++++++++++++-------
 Dockerfile     |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea5576fd..50070cca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,22 +16,34 @@ default:
     - generic_privileged
 
 build-branch:
-  except:
-    - tags
   variables:
-    TARGET: "selfhost-privacy"
+    TARGET: "ecloud"
+  rules:
+    # Match expcept tags rule
+    - if: '$CI_COMMIT_TAG =~ "/^$/"'
+      when: always
+    # If branch is a selfhost
+    - if: `$CI_COMMIT_REF_SLUG =~ "/^selfhost*/"`
+      variables:
+        TARGET: "selfhost"
+    - when: never
   stage: build
   script:
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
 
 build-tag:
-  only:
-    - tags
   variables:
-    TARGET: "selfhost-privacy"
+    TARGET: "ecloud"
+  rules:
+    - if: '$CI_COMMIT_TAG !~ "/^$/"'
+      when: always
+    - if: `$CI_COMMIT_TAG =~ "/^selfhost*/"`
+      variables:
+        TARGET: "selfhost"
+      when: always
+    - when: never
   stage: build
   script:
-    - if [ "$CI_COMMIT_TAG" == "selfhost" ]; then export TARGET="selfhost"; fi
     - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
diff --git a/Dockerfile b/Dockerfile
index 39267b5f..4a2a358b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -137,7 +137,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/0
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
-FROM selfhost as selfhost-privacy
+FROM selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 
-- 
GitLab


From 3ec63a0076816ca3bb8ee34e697a09d32add13f1 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Thu, 11 Nov 2021 20:17:59 +0530
Subject: [PATCH 10/35] fix syntax

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50070cca..b1b8d2db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ build-branch:
     - if: '$CI_COMMIT_TAG =~ "/^$/"'
       when: always
     # If branch is a selfhost
-    - if: `$CI_COMMIT_REF_SLUG =~ "/^selfhost*/"`
+    - if: '$CI_COMMIT_REF_SLUG =~ "/^selfhost*/"'
       variables:
         TARGET: "selfhost"
     - when: never
@@ -38,7 +38,7 @@ build-tag:
   rules:
     - if: '$CI_COMMIT_TAG !~ "/^$/"'
       when: always
-    - if: `$CI_COMMIT_TAG =~ "/^selfhost*/"`
+    - if: '$CI_COMMIT_TAG =~ "/^selfhost*/"'
       variables:
         TARGET: "selfhost"
       when: always
-- 
GitLab


From 7a7da171ba1299fa331bf61a1d4e7b101d017434 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Thu, 11 Nov 2021 21:36:29 +0530
Subject: [PATCH 11/35] fix build-tag

---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1b8d2db..0801bb61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ build-branch:
     TARGET: "ecloud"
   rules:
     # Match expcept tags rule
-    - if: '$CI_COMMIT_TAG =~ "/^$/"'
+    - if: $CI_COMMIT_TAG == null
       when: always
     # If branch is a selfhost
     - if: '$CI_COMMIT_REF_SLUG =~ "/^selfhost*/"'
@@ -29,6 +29,7 @@ build-branch:
     - when: never
   stage: build
   script:
+    - echo "CI_COMMIT_TAG $CI_COMMIT_TAG"
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
 
@@ -36,7 +37,7 @@ build-tag:
   variables:
     TARGET: "ecloud"
   rules:
-    - if: '$CI_COMMIT_TAG !~ "/^$/"'
+    - if: $CI_COMMIT_TAG != null
       when: always
     - if: '$CI_COMMIT_TAG =~ "/^selfhost*/"'
       variables:
@@ -45,5 +46,6 @@ build-tag:
     - when: never
   stage: build
   script:
+    - echo "CI_COMMIT_TAG $CI_COMMIT_TAG"
     - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-- 
GitLab


From f6d33ff681306b7b0b7bba79303d4540c5dd41f0 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Thu, 11 Nov 2021 21:40:11 +0530
Subject: [PATCH 12/35] test docker tag build

---
 .gitlab-ci.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0801bb61..b4ccac39 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,13 +20,13 @@ build-branch:
     TARGET: "ecloud"
   rules:
     # Match expcept tags rule
-    - if: $CI_COMMIT_TAG == null
-      when: always
+    - if: $CI_COMMIT_TAG != null
+      when: never
     # If branch is a selfhost
     - if: '$CI_COMMIT_REF_SLUG =~ "/^selfhost*/"'
       variables:
         TARGET: "selfhost"
-    - when: never
+    - when: on_success
   stage: build
   script:
     - echo "CI_COMMIT_TAG $CI_COMMIT_TAG"
@@ -37,13 +37,12 @@ build-tag:
   variables:
     TARGET: "ecloud"
   rules:
-    - if: $CI_COMMIT_TAG != null
-      when: always
+    - if: $CI_COMMIT_TAG == null
+      when: never
     - if: '$CI_COMMIT_TAG =~ "/^selfhost*/"'
       variables:
         TARGET: "selfhost"
-      when: always
-    - when: never
+    - when: on_success
   stage: build
   script:
     - echo "CI_COMMIT_TAG $CI_COMMIT_TAG"
-- 
GitLab


From 5958400ca1de29a3748de62b72e8dcacf73bcacf Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Thu, 11 Nov 2021 21:51:33 +0530
Subject: [PATCH 13/35] echo TARGET

---
 .gitlab-ci.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4ccac39..f172bca1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,17 +19,17 @@ build-branch:
   variables:
     TARGET: "ecloud"
   rules:
+    # If branch is a selfhost change variable
+    - if: '$CI_COMMIT_REF_SLUG =~ "/^selfhost/"'
+      variables:
+        TARGET: "selfhost"
     # Match expcept tags rule
     - if: $CI_COMMIT_TAG != null
       when: never
-    # If branch is a selfhost
-    - if: '$CI_COMMIT_REF_SLUG =~ "/^selfhost*/"'
-      variables:
-        TARGET: "selfhost"
     - when: on_success
   stage: build
   script:
-    - echo "CI_COMMIT_TAG $CI_COMMIT_TAG"
+    - echo "Running job for CI_COMMIT_TAG $CI_COMMIT_TAG, TARGET $TARGET, REF $CI_COMMIT_REF_SLUG"
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
 
@@ -37,14 +37,14 @@ build-tag:
   variables:
     TARGET: "ecloud"
   rules:
-    - if: $CI_COMMIT_TAG == null
-      when: never
-    - if: '$CI_COMMIT_TAG =~ "/^selfhost*/"'
+    - if: '$CI_COMMIT_TAG =~ "/^selfhost/"'
       variables:
         TARGET: "selfhost"
+    - if: $CI_COMMIT_TAG == null
+      when: never
     - when: on_success
   stage: build
   script:
-    - echo "CI_COMMIT_TAG $CI_COMMIT_TAG"
+    - echo "Running job for CI_COMMIT_TAG $CI_COMMIT_TAG, TARGET $TARGET, REF $CI_COMMIT_REF_SLUG"
     - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-- 
GitLab


From a161e475788d785d5593dfc6b4976b20f2692542 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Fri, 12 Nov 2021 11:27:41 +0530
Subject: [PATCH 14/35] push images to registry

---
 .gitlab-ci.yml | 62 +++++++++++++++++++++++++++-----------------------
 Dockerfile     |  2 +-
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f172bca1..ebb98e43 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,35 +16,39 @@ default:
     - generic_privileged
 
 build-branch:
-  variables:
-    TARGET: "ecloud"
-  rules:
-    # If branch is a selfhost change variable
-    - if: '$CI_COMMIT_REF_SLUG =~ "/^selfhost/"'
-      variables:
-        TARGET: "selfhost"
-    # Match expcept tags rule
-    - if: $CI_COMMIT_TAG != null
-      when: never
-    - when: on_success
+  # variables:
+  #   TARGET: "ecloud"
+  # rules:
+  #   # If branch is a selfhost change variable
+  #   - if: '$CI_COMMIT_REF_SLUG =~ "/^selfhost/"'
+  #     variables:
+  #       TARGET: "selfhost"
+  #   # Match expcept tags rule
+  #   - if: $CI_COMMIT_TAG != null
+  #     when: never
+  #   - when: on_success
+  expcept:
+    - tags
   stage: build
   script:
-    - echo "Running job for CI_COMMIT_TAG $CI_COMMIT_TAG, TARGET $TARGET, REF $CI_COMMIT_REF_SLUG"
-    - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+    #- echo "Running job for CI_COMMIT_TAG $CI_COMMIT_TAG, TARGET $TARGET, REF $CI_COMMIT_REF_SLUG"
+    - docker build --target selfhost  --pull -t "$CI_REGISTRY_IMAGE:selfhost" .
+    - docker push "$CI_REGISTRY_IMAGE:selfhost"
+    - docker build --target selfhost-privacy  --pull -t "$CI_REGISTRY_IMAGE:selfhost-privacy" .
+    - docker push "$CI_REGISTRY_IMAGE:selfhost-privacy"
 
-build-tag:
-  variables:
-    TARGET: "ecloud"
-  rules:
-    - if: '$CI_COMMIT_TAG =~ "/^selfhost/"'
-      variables:
-        TARGET: "selfhost"
-    - if: $CI_COMMIT_TAG == null
-      when: never
-    - when: on_success
-  stage: build
-  script:
-    - echo "Running job for CI_COMMIT_TAG $CI_COMMIT_TAG, TARGET $TARGET, REF $CI_COMMIT_REF_SLUG"
-    - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+# build-tag:
+#   variables:
+#     TARGET: "ecloud"
+#   rules:
+#     - if: '$CI_COMMIT_TAG =~ "/^selfhost/"'
+#       variables:
+#         TARGET: "selfhost"
+#     - if: $CI_COMMIT_TAG == null
+#       when: never
+#     - when: on_success
+#   stage: build
+#   script:
+#     - echo "Running job for CI_COMMIT_TAG $CI_COMMIT_TAG, TARGET $TARGET, REF $CI_COMMIT_REF_SLUG"
+#     - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
+#     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
diff --git a/Dockerfile b/Dockerfile
index 4a2a358b..dcfded4b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -137,7 +137,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/0
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
-FROM selfhost as ecloud
+FROM selfhost as selhost-privacy
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 
-- 
GitLab


From 60f909fd3585f7ebe3c971be029b4e94d7863d96 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Fri, 12 Nov 2021 11:29:49 +0530
Subject: [PATCH 15/35] fix syntax

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebb98e43..22d76de9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ build-branch:
   #   - if: $CI_COMMIT_TAG != null
   #     when: never
   #   - when: on_success
-  expcept:
+  except:
     - tags
   stage: build
   script:
-- 
GitLab


From 233bb0e1ce038616209019dc2b2bd238f914e4b6 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Fri, 12 Nov 2021 11:31:52 +0530
Subject: [PATCH 16/35] fix dockerfile target

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index dcfded4b..39267b5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -137,7 +137,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/0
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
-FROM selfhost as selhost-privacy
+FROM selfhost as selfhost-privacy
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 
-- 
GitLab


From 6bf348903b09cca29e43c09be8b580a474c5d84c Mon Sep 17 00:00:00 2001
From: Nivesh <nivesh@e.email>
Date: Fri, 12 Nov 2021 12:06:32 +0530
Subject: [PATCH 17/35] bump version to 17

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 39267b5f..149a353a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.5-1-nightly"
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
 COPY custom_entrypoint.sh /
 RUN chmod +x /custom_entrypoint.sh
-RUN sed -i 's/20,0,12,1/20,0,12,16/' ${BASE_DIR}/version.php
+RUN sed -i 's/20,0,12,1/20,0,12,17/' ${BASE_DIR}/version.php
 
 # Install unzip for unzipping artifacts
 RUN apt-get update && apt-get install unzip 
-- 
GitLab


From d2b3d471fe911beebd64f4d326cfd6e0b445d1b0 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Mon, 15 Nov 2021 20:43:42 +0530
Subject: [PATCH 18/35] add selfhost pipeline for branch

---
 .gitlab-ci.yml | 25 ++++++++-----------------
 Dockerfile     |  2 +-
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22d76de9..a4e4b153 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,26 +16,17 @@ default:
     - generic_privileged
 
 build-branch:
-  # variables:
-  #   TARGET: "ecloud"
-  # rules:
-  #   # If branch is a selfhost change variable
-  #   - if: '$CI_COMMIT_REF_SLUG =~ "/^selfhost/"'
-  #     variables:
-  #       TARGET: "selfhost"
-  #   # Match expcept tags rule
-  #   - if: $CI_COMMIT_TAG != null
-  #     when: never
-  #   - when: on_success
   except:
     - tags
+  variables:
+    TARGET: ecloud
+    IMAGE: ecloud
   stage: build
   script:
-    #- echo "Running job for CI_COMMIT_TAG $CI_COMMIT_TAG, TARGET $TARGET, REF $CI_COMMIT_REF_SLUG"
-    - docker build --target selfhost  --pull -t "$CI_REGISTRY_IMAGE:selfhost" .
-    - docker push "$CI_REGISTRY_IMAGE:selfhost"
-    - docker build --target selfhost-privacy  --pull -t "$CI_REGISTRY_IMAGE:selfhost-privacy" .
-    - docker push "$CI_REGISTRY_IMAGE:selfhost-privacy"
+    - if [[ $CI_COMMIT_REF_SLUG =~ ^selfhost ]]; then TARGET="selfhost"; IMAGE="selfhost" fi
+    - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
+
 
 # build-tag:
 #   variables:
@@ -44,7 +35,7 @@ build-branch:
 #     - if: '$CI_COMMIT_TAG =~ "/^selfhost/"'
 #       variables:
 #         TARGET: "selfhost"
-#     - if: $CI_COMMIT_TAG == null
+#     - ifs: $CI_COMMIT_TAG == null
 #       when: never
 #     - when: on_success
 #   stage: build
diff --git a/Dockerfile b/Dockerfile
index 149a353a..ac2e0c54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -137,7 +137,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/0
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
-FROM selfhost as selfhost-privacy
+FROM selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 
-- 
GitLab


From 2a75f6d5ac94741f2e135fab2b8ca86e1d6e1136 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Mon, 15 Nov 2021 20:47:54 +0530
Subject: [PATCH 19/35] fix syntax

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4e4b153..edc4a5a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,8 @@ build-branch:
     IMAGE: ecloud
   stage: build
   script:
-    - if [[ $CI_COMMIT_REF_SLUG =~ ^selfhost ]]; then TARGET="selfhost"; IMAGE="selfhost" fi
+    - if [[ $CI_COMMIT_REF_SLUG =~ ^selfhost ]]; then TARGET="selfhost" && IMAGE="selfhost"; fi
+    - echo $TARGET $IMAGE
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
 
-- 
GitLab


From 5a9dafc281bac6a7f3bbb2aacaee53258cef9cd3 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Mon, 15 Nov 2021 21:05:30 +0530
Subject: [PATCH 20/35] add rules instead on except

---
 .gitlab-ci.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index edc4a5a3..23801ba6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,15 +16,21 @@ default:
     - generic_privileged
 
 build-branch:
-  except:
-    - tags
+  stage: build
   variables:
     TARGET: ecloud
     IMAGE: ecloud
-  stage: build
+  rules:
+    - if: $CI_COMMIT_TAG != null
+      when: never
+    - if: '$CI_COMMIT_REF_SLUG =~ "/^selfhost/"'
+      variables:
+        TARGET: "selfhost"
+        IMAGE: "selfhost"
+    - if: $CI_COMMIT_REF_SLUG != null
+
   script:
-    - if [[ $CI_COMMIT_REF_SLUG =~ ^selfhost ]]; then TARGET="selfhost" && IMAGE="selfhost"; fi
-    - echo $TARGET $IMAGE
+    - echo $TARGET $IMAGE $CI_COMMIT_REF_SLUG $CI_COMMIT_TAG
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
 
@@ -36,7 +42,7 @@ build-branch:
 #     - if: '$CI_COMMIT_TAG =~ "/^selfhost/"'
 #       variables:
 #         TARGET: "selfhost"
-#     - ifs: $CI_COMMIT_TAG == null
+#     - if: $CI_COMMIT_TAG == null
 #       when: never
 #     - when: on_success
 #   stage: build
-- 
GitLab


From 1be9b5ff6dd1f6ceceb4fc009dce514ce6cb13c3 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 16 Nov 2021 00:32:22 +0530
Subject: [PATCH 21/35] add debug

---
 .gitlab-ci.yml | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23801ba6..cfbbf3ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,38 +15,18 @@ default:
   tags:
     - generic_privileged
 
-build-branch:
+build:
   stage: build
   variables:
     TARGET: ecloud
     IMAGE: ecloud
+    CI_DEBUG_TRACE: "true"
   rules:
-    - if: $CI_COMMIT_TAG != null
-      when: never
-    - if: '$CI_COMMIT_REF_SLUG =~ "/^selfhost/"'
+    - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
       variables:
         TARGET: "selfhost"
         IMAGE: "selfhost"
-    - if: $CI_COMMIT_REF_SLUG != null
-
   script:
-    - echo $TARGET $IMAGE $CI_COMMIT_REF_SLUG $CI_COMMIT_TAG
+    - echo $TARGET, $IMAGE, $CI_COMMIT_BRANCH, $CI_COMMIT_REF_SLUG, $CI_COMMIT_TAG
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
-
-
-# build-tag:
-#   variables:
-#     TARGET: "ecloud"
-#   rules:
-#     - if: '$CI_COMMIT_TAG =~ "/^selfhost/"'
-#       variables:
-#         TARGET: "selfhost"
-#     - if: $CI_COMMIT_TAG == null
-#       when: never
-#     - when: on_success
-#   stage: build
-#   script:
-#     - echo "Running job for CI_COMMIT_TAG $CI_COMMIT_TAG, TARGET $TARGET, REF $CI_COMMIT_REF_SLUG"
-#     - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
-#     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-- 
GitLab


From 457b26617de94ae351dfc61ae4e03d052656774a Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 16 Nov 2021 00:58:04 +0530
Subject: [PATCH 22/35] create separate jobs for tag/branch

---
 .gitlab-ci.yml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfbbf3ba..1c5ee632 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,13 +15,14 @@ default:
   tags:
     - generic_privileged
 
-build:
+build-branch:
   stage: build
   variables:
     TARGET: ecloud
     IMAGE: ecloud
-    CI_DEBUG_TRACE: "true"
   rules:
+    - if: $CI_COMMIT_TAG != null
+      When: never
     - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
       variables:
         TARGET: "selfhost"
@@ -30,3 +31,20 @@ build:
     - echo $TARGET, $IMAGE, $CI_COMMIT_BRANCH, $CI_COMMIT_REF_SLUG, $CI_COMMIT_TAG
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
+
+build-tag:
+  stage: build
+  variables:
+    TARGET: ecloud
+    IMAGE: ecloud
+  rules:
+    - if: $CI_COMMIT_TAG == null
+      When: never
+    - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
+      variables:
+        TARGET: "selfhost"
+        IMAGE: "selfhost"
+  script:
+    - echo $TARGET, $IMAGE, $CI_COMMIT_BRANCH, $CI_COMMIT_REF_SLUG, $CI_COMMIT_TAG
+    - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
\ No newline at end of file
-- 
GitLab


From 642fbd5431c60d5a8ca3e400333019a37d16e0bd Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 16 Nov 2021 01:03:11 +0530
Subject: [PATCH 23/35] fix syntax for when

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c5ee632..5e08cec6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ build-branch:
     IMAGE: ecloud
   rules:
     - if: $CI_COMMIT_TAG != null
-      When: never
+      when: never
     - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
       variables:
         TARGET: "selfhost"
@@ -39,7 +39,7 @@ build-tag:
     IMAGE: ecloud
   rules:
     - if: $CI_COMMIT_TAG == null
-      When: never
+      when: never
     - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
       variables:
         TARGET: "selfhost"
-- 
GitLab


From 040b77bc670733534256361f1ec5e8b249b0122a Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 16 Nov 2021 13:59:23 +0530
Subject: [PATCH 24/35] add docker-tag stage

---
 .gitlab-ci.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e08cec6..66c2566a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,4 +47,16 @@ build-tag:
   script:
     - echo $TARGET, $IMAGE, $CI_COMMIT_BRANCH, $CI_COMMIT_REF_SLUG, $CI_COMMIT_TAG
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
\ No newline at end of file
+    - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
+
+docker-tag:
+  stage: build
+  rules:
+    - if: $SOURCE == null || $TARGET == null
+      when: never
+    - when: manual
+
+  script:
+    - docker pull $CI_REGISTRY_IMAGE/$SOURCE
+    - docker tag $CI_REGISTRY_IMAGE/$SOURCE $CI_REGISTRY_IMAGE/$TARGET
+    - docker push $CI_REGISTRY_IMAGE/$TARGET
\ No newline at end of file
-- 
GitLab


From 70ea3fddf4c62274e19fb104f7624c55e927e6fc Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 16 Nov 2021 14:01:56 +0530
Subject: [PATCH 25/35] use .post stage for docker tag

---
 .gitlab-ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66c2566a..3e2bdde7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,12 +50,9 @@ build-tag:
     - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
 
 docker-tag:
-  stage: build
+  stage: .post
   rules:
-    - if: $SOURCE == null || $TARGET == null
-      when: never
     - when: manual
-
   script:
     - docker pull $CI_REGISTRY_IMAGE/$SOURCE
     - docker tag $CI_REGISTRY_IMAGE/$SOURCE $CI_REGISTRY_IMAGE/$TARGET
-- 
GitLab


From 1c86e1f2cc0e3e80b709f0a5c7d6237fd5c264ff Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 16 Nov 2021 14:39:06 +0530
Subject: [PATCH 26/35] [CI-SKIP] update README

---
 .gitlab-ci.yml |  1 +
 README.md      | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e2bdde7..5a2ba832 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ build-tag:
   variables:
     TARGET: ecloud
     IMAGE: ecloud
+  allow_failure: true
   rules:
     - if: $CI_COMMIT_TAG == null
       when: never
diff --git a/README.md b/README.md
index fa798dec..2a4453e5 100644
--- a/README.md
+++ b/README.md
@@ -13,3 +13,17 @@ We suggest you use our [ecloud-selfhosting](https://gitlab.e.foundation/e/infra/
 ## Contributing
 
 Anyone can fork a project on our GitLab instance, but to prevent abuse it's disabled by default. Get in touch with us [by e-mail](mailto:join@e.email) or through our support channels and we will let you create a fork and submit MRs.
+
+## Pipeline-Jobs
+
+There are two images in total that can be built by running the pipeline based on $CI_COMMIT_REF_SLUG. Any branch or tag starting `selfhost` will build an image for selfhost target. And in all other cases image is built for `ecloud` target
+
+[**1. selfhost**](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/container_registry/94)
+
+[**2. ecloud**](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/container_registry/93)
+
+**Re-tagging**
+
+There is a provision to create a new tag from an existing image by simply running docker-tag job (manual action). It requires two input parameters, SOURCE and TARGET.
+
+Example: Create a new release for ecloud:20.12.11 from ecloud:20.12.10, we just have to run `docker-tag` job by providing `SOURCE: ecloud:20.12.10` `TARGET: ecloud:20.12.11`. Ref : [this job](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/-/jobs/219782)
\ No newline at end of file
-- 
GitLab


From 16805a7e5bdbe15d6bc91a2f5a3d81d5484a7eea Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 16 Nov 2021 14:40:20 +0530
Subject: [PATCH 27/35] [CI-SKIP] update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2a4453e5..8b2cffc9 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Anyone can fork a project on our GitLab instance, but to prevent abuse it's disa
 
 ## Pipeline-Jobs
 
-There are two images in total that can be built by running the pipeline based on $CI_COMMIT_REF_SLUG. Any branch or tag starting `selfhost` will build an image for selfhost target. And in all other cases image is built for `ecloud` target
+There are two images in total that can be built by running the pipeline based on $CI_COMMIT_REF_SLUG. Any branch or tag starting with `selfhost` will build an image for selfhost target. And in all other cases image is built for `ecloud` target
 
 [**1. selfhost**](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/container_registry/94)
 
-- 
GitLab


From 46bd9a1a12ecbc89ba7302119cf3ddc7b440e82f Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 17 Nov 2021 15:31:58 +0530
Subject: [PATCH 28/35] use same root image

---
 .gitlab-ci.yml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a2ba832..c83a7894 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,24 +19,21 @@ build-branch:
   stage: build
   variables:
     TARGET: ecloud
-    IMAGE: ecloud
   rules:
     - if: $CI_COMMIT_TAG != null
       when: never
     - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
       variables:
         TARGET: "selfhost"
-        IMAGE: "selfhost"
   script:
-    - echo $TARGET, $IMAGE, $CI_COMMIT_BRANCH, $CI_COMMIT_REF_SLUG, $CI_COMMIT_TAG
-    - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
+    - echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG"
+    - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
 
 build-tag:
   stage: build
   variables:
     TARGET: ecloud
-    IMAGE: ecloud
   allow_failure: true
   rules:
     - if: $CI_COMMIT_TAG == null
@@ -44,17 +41,17 @@ build-tag:
     - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
       variables:
         TARGET: "selfhost"
-        IMAGE: "selfhost"
   script:
-    - echo $TARGET, $IMAGE, $CI_COMMIT_BRANCH, $CI_COMMIT_REF_SLUG, $CI_COMMIT_TAG
-    - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE/$IMAGE:$CI_COMMIT_REF_SLUG"
+    - echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG"
+    - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
 
 docker-tag:
   stage: .post
   rules:
     - when: manual
   script:
-    - docker pull $CI_REGISTRY_IMAGE/$SOURCE
-    - docker tag $CI_REGISTRY_IMAGE/$SOURCE $CI_REGISTRY_IMAGE/$TARGET
-    - docker push $CI_REGISTRY_IMAGE/$TARGET
\ No newline at end of file
+    - echo "SOURCE $SOURCE, TARGET $TARGET"
+    - docker pull $CI_REGISTRY_IMAGE:$SOURCE
+    - docker tag $CI_REGISTRY_IMAGE:$SOURCE $CI_REGISTRY_IMAGE:$TARGET
+    - docker push $CI_REGISTRY_IMAGE:$TARGET
\ No newline at end of file
-- 
GitLab


From 344b78040bd859d379cddd519ec3b0e3ecd9d254 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 17 Nov 2021 15:34:08 +0530
Subject: [PATCH 29/35] update readme

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8b2cffc9..21d8751e 100644
--- a/README.md
+++ b/README.md
@@ -16,14 +16,14 @@ Anyone can fork a project on our GitLab instance, but to prevent abuse it's disa
 
 ## Pipeline-Jobs
 
-There are two images in total that can be built by running the pipeline based on $CI_COMMIT_REF_SLUG. Any branch or tag starting with `selfhost` will build an image for selfhost target. And in all other cases image is built for `ecloud` target
+By default pipeline build image based on $CI_COMMIT_REF_SLUG. Any branch or tag starting with `selfhost` will build an image for selfhost target. And in all other cases image is built for `ecloud` target
 
-[**1. selfhost**](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/container_registry/94)
+[**1. selfhost**](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/container_registry/46)
 
-[**2. ecloud**](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/container_registry/93)
+[**2. ecloud**](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/container_registry/46)
 
 **Re-tagging**
 
 There is a provision to create a new tag from an existing image by simply running docker-tag job (manual action). It requires two input parameters, SOURCE and TARGET.
 
-Example: Create a new release for ecloud:20.12.11 from ecloud:20.12.10, we just have to run `docker-tag` job by providing `SOURCE: ecloud:20.12.10` `TARGET: ecloud:20.12.11`. Ref : [this job](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/-/jobs/219782)
\ No newline at end of file
+Example: Create a new release for ecloud:20.12.11 from ecloud:20.12.10, we just have to run `docker-tag` job by providing `SOURCE: ecloud-20.12.10` `TARGET: ecloud-20.12.11`. Ref : [this job](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/-/jobs/219782)
\ No newline at end of file
-- 
GitLab


From bb1e736b50097a0115cfda461d39efe9a0db0061 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 17 Nov 2021 16:01:48 +0530
Subject: [PATCH 30/35] apply privacy patch in selfhost

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ac2e0c54..81ffd5c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -135,6 +135,7 @@ RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php
 RUN patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR}/008-icons-cacher-theme-svgs.patch
 RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/008-svg-controller-theme-svgs.patch
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch
+RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
 FROM selfhost as ecloud
@@ -149,7 +150,6 @@ RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PAT
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch
 RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch
 RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch
-RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch
 RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch
 
 # autocomplete leak tweak apps frontend with sed, disable group suggestion
-- 
GitLab


From 85930853de313ce34fd037db9b00dd33c093740c Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 17 Nov 2021 16:59:49 +0530
Subject: [PATCH 31/35] fix when to run job

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c83a7894..3b1b1d0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,6 @@ default:
   services:
     - docker:19.03.12-dind
   before_script:
-    - docker info
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   tags:
     - generic_privileged
@@ -25,6 +24,8 @@ build-branch:
     - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
       variables:
         TARGET: "selfhost"
+    - if: $CI_COMMIT_REF_SLUG != null
+      when: on_success
   script:
     - echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG"
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
@@ -41,6 +42,8 @@ build-tag:
     - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
       variables:
         TARGET: "selfhost"
+    - if: $CI_COMMIT_TAG != null
+      when: on_success
   script:
     - echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG"
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-- 
GitLab


From 5b552e0f1ebea34ae70c2be05a6efbce693eb557 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 17 Nov 2021 17:15:49 +0530
Subject: [PATCH 32/35] remove allow failure

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b1b1d0a..83ce0619 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,7 @@ build-branch:
         TARGET: "selfhost"
     - if: $CI_COMMIT_REF_SLUG != null
       when: on_success
+  allow_failure: true
   script:
     - echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG"
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-- 
GitLab


From 561e9746474c07f6b1b2de04c5a681017dd7a5f6 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 17 Nov 2021 17:16:12 +0530
Subject: [PATCH 33/35] remove allow failure

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83ce0619..b7a5d792 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,6 @@ build-branch:
         TARGET: "selfhost"
     - if: $CI_COMMIT_REF_SLUG != null
       when: on_success
-  allow_failure: true
   script:
     - echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG"
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
@@ -36,7 +35,6 @@ build-tag:
   stage: build
   variables:
     TARGET: ecloud
-  allow_failure: true
   rules:
     - if: $CI_COMMIT_TAG == null
       when: never
-- 
GitLab


From 7d41d2c4e0fea2b10d64bc039fb2e9c1b890194b Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 17 Nov 2021 17:20:11 +0530
Subject: [PATCH 34/35] not trigger when merge_event

---
 .gitlab-ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7a5d792..3e0a8000 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,8 @@ build-branch:
   variables:
     TARGET: ecloud
   rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
     - if: $CI_COMMIT_TAG != null
       when: never
     - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
@@ -26,6 +28,7 @@ build-branch:
         TARGET: "selfhost"
     - if: $CI_COMMIT_REF_SLUG != null
       when: on_success
+  allow_failure: true
   script:
     - echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG"
     - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
@@ -35,7 +38,10 @@ build-tag:
   stage: build
   variables:
     TARGET: ecloud
+  allow_failure: true
   rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
     - if: $CI_COMMIT_TAG == null
       when: never
     - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
-- 
GitLab


From 4792bb3e2ace2b419d1a6f0bacc68b82c537cfc6 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Thu, 18 Nov 2021 10:56:22 +0530
Subject: [PATCH 35/35] update readme

---
 README.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 21d8751e..5c6309ff 100644
--- a/README.md
+++ b/README.md
@@ -16,14 +16,11 @@ Anyone can fork a project on our GitLab instance, but to prevent abuse it's disa
 
 ## Pipeline-Jobs
 
-By default pipeline build image based on $CI_COMMIT_REF_SLUG. Any branch or tag starting with `selfhost` will build an image for selfhost target. And in all other cases image is built for `ecloud` target
+By default pipeline builds image based on $CI_COMMIT_REF_SLUG. Any branch or tag starting with `selfhost` will build an image for selfhost target. And in all other cases image is built for `ecloud` target. The image is tagged with $CI_COMMIT_REF_SLUG and pushed to registry
 
-[**1. selfhost**](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/container_registry/46)
-
-[**2. ecloud**](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/container_registry/46)
 
 **Re-tagging**
 
 There is a provision to create a new tag from an existing image by simply running docker-tag job (manual action). It requires two input parameters, SOURCE and TARGET.
 
-Example: Create a new release for ecloud:20.12.11 from ecloud:20.12.10, we just have to run `docker-tag` job by providing `SOURCE: ecloud-20.12.10` `TARGET: ecloud-20.12.11`. Ref : [this job](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/-/jobs/219782)
\ No newline at end of file
+Example: To publish a given image to production you can tag ecloud-21.x.x as ecloud-production, we just have to run `docker-tag` job by providing `SOURCE: ecloud-20.12.10` `TARGET: ecloud-production`. Ref : [this job](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/-/jobs/219782)
\ No newline at end of file
-- 
GitLab