From 236fda093d160343d6bc2d9249a671130ab79f14 Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 6 Aug 2021 16:16:44 +0530 Subject: [PATCH 01/34] Removed external sites patch since it is managed through launcher app js --- Dockerfile | 1 - ...emove-external-sites-from-navigation.patch | 24 ------------------- 2 files changed, 25 deletions(-) delete mode 100644 patches/009-remove-external-sites-from-navigation.patch diff --git a/Dockerfile b/Dockerfile index 22d713b9..f04bcdb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -88,7 +88,6 @@ RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.pa 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 patch -u ${BASE_DIR}/lib/private/TemplateLayout.php -i ${TMP_PATCH_DIR}/009-remove-external-sites-from-navigation.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/009-remove-external-sites-from-navigation.patch b/patches/009-remove-external-sites-from-navigation.patch deleted file mode 100644 index 6b359727..00000000 --- a/patches/009-remove-external-sites-from-navigation.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Akhil -Date: Tue, 28 Jul 2021 21:25:00 +0530 -Subject: [PATCH] Removes external results from navigation - -This patch removes external link results from navigation. External link results are those coming from the -"external sites" app - -diff --git ./lib/private/TemplateLayout.php ./lib/private/TemplateLayout-new.php ---- ./lib/private/TemplateLayout.php 2021-07-29 00:10:10.515495166 +0530 -+++ ./lib/private/TemplateLayout-new.php 2021-07-29 00:10:27.873160383 +0530 -@@ -105,7 +105,12 @@ - $this->assign('application', ''); - $this->assign('appid', $appId); - -- $navigation = $this->navigationManager->getAll(); -+ $navigation = $this->navigationManager->getAll(); -+ $navigation = array_filter($navigation, function($entry) { -+ if (strpos($entry["id"], "external_index") !== 0) { -+ return true; -+ } -+ }); - $this->assign('navigation', $navigation); - $settingsNavigation = $this->navigationManager->getAll('settings'); - $this->assign('settingsnavigation', $settingsNavigation); -- GitLab From 262265ad6fe5806ccb340cf2191222a7b55cb31a Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 6 Aug 2021 16:21:44 +0530 Subject: [PATCH 02/34] Added theme helper and updated theme version --- Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f04bcdb7..42a856a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM nextcloud:20.0.11-fpm ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="20.0.11" +ARG THEME_VERSION="21.0.0-beta" +ARG THEME_HELPER_VERSION="1.0.0-beta" ARG NEWS_VERSION="16.0.0" ARG QUOTA_WARN_VERSION="1.9.1" ARG NOTES_VERSION="4.1.0" @@ -72,6 +73,12 @@ RUN curl -fsSL -o ecloud_drop_account.tar.gz \ mv "${BASE_DIR}/custom_apps/ecloud-drop-account-${EDA_TAG}" "${BASE_DIR}/custom_apps/ecloud_drop_account" && \ rm ecloud_drop_account.tar.gz; +RUN curl -fsSL -o ecloud-theme-helper.tar.gz \ + "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/ecloud-theme-helper/-/archive/${THEME_HELPER_VERSION}/ecloud-theme-helper-${THEME_HELPER_VERSION}.tar.gz" && \ + tar -xf ecloud-theme-helper.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + mv "${BASE_DIR}/custom_apps/ecloud-theme-helper-${THEME_HELPER_VERSION}" "${BASE_DIR}/custom_apps/ecloud-theme-helper" && \ + rm ecloud_drop_account.tar.gz; + # Remove unzip when unzipping is done RUN apt-get -y remove unzip -- GitLab From b52df9f6d8ab70977749e0ab662505ad143b33ac Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 6 Aug 2021 17:48:25 +0530 Subject: [PATCH 03/34] Added rsync of launcher and theme apps; Added app enable/disable steps to entrypoint --- Dockerfile | 12 +++++++++--- custom_entrypoint.sh | 14 +++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 42a856a6..3df77709 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:20.0.11-fpm ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="21.0.0-beta" +ARG THEME_VERSION="20.1.0-beta" ARG THEME_HELPER_VERSION="1.0.0-beta" ARG NEWS_VERSION="16.0.0" ARG QUOTA_WARN_VERSION="1.9.1" @@ -12,8 +12,8 @@ ARG USER_BACKEND_RAW_SQL_VERSION="1.1.0" ARG EMAIL_RECOVERY_JOB_ID="162557" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" -ARG USC_VERSION="1.0.0" ARG EDA_TAG="nc-20" +ARG ECLOUD_LAUNCHER_JOB_ID="188715" RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ ${TMP_PATCH_DIR}/ @@ -77,7 +77,13 @@ RUN curl -fsSL -o ecloud-theme-helper.tar.gz \ "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/ecloud-theme-helper/-/archive/${THEME_HELPER_VERSION}/ecloud-theme-helper-${THEME_HELPER_VERSION}.tar.gz" && \ tar -xf ecloud-theme-helper.tar.gz -C ${BASE_DIR}/custom_apps/ && \ mv "${BASE_DIR}/custom_apps/ecloud-theme-helper-${THEME_HELPER_VERSION}" "${BASE_DIR}/custom_apps/ecloud-theme-helper" && \ - rm ecloud_drop_account.tar.gz; + rm ecloud-theme-helper.tar.gz; + +RUN curl -fsSL -o ecloud-launcher.zip \ + "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/launcher/-/jobs/${ECLOUD_LAUNCHER_JOB_ID}/artifacts/download" && \ + unzip ecloud-launcher.zip && \ + mv dist/ecloud-launcher ${BASE_DIR}/custom_apps/ && \ + rm ecloud-launcher.zip; # Remove unzip when unzipping is done RUN apt-get -y remove unzip diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 892723e2..ba562110 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -26,10 +26,22 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/rainloop" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/email-recovery" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/ecloud_drop_account" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ + 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 "/eelo/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ else echo "Skipping rsync step as version not updated!" fi -/entrypoint.sh "$@" \ No newline at end of file +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 ecloud-launcher" + su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-theme-helper" +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:disable ecloud-theme-helper" +fi + +/entrypoint.sh "$@" -- GitLab From df50751a41117ce1462f99cd8317fa4f589d072b Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 9 Aug 2021 14:05:50 +0530 Subject: [PATCH 04/34] Added replacement of links for docs and help --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 3df77709..33fc286b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -101,6 +101,8 @@ RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.pa 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 sed -i 's/https:\/\/docs.nextcloud.com/https:\/\/support.e.foundation\/how-tos#ecloud-eemail--account/' ${BASE_DIR}/apps/settings/templates/help.php +RUN sed -i 's/https:\/\/help.nextcloud.com/https:\/\/community.e.foundation/' ${BASE_DIR}/apps/settings/templates/help.php RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion -- GitLab From 4f6471e8ec80dfa8515e643f1acb00cdae30eacb Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 10 Aug 2021 17:43:30 +0530 Subject: [PATCH 05/34] Added patches for help links --- Dockerfile | 3 +- patches/009-help-links.patch | 74 ++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 patches/009-help-links.patch diff --git a/Dockerfile b/Dockerfile index 33fc286b..caa9c56d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -101,8 +101,7 @@ RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.pa 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 sed -i 's/https:\/\/docs.nextcloud.com/https:\/\/support.e.foundation\/how-tos#ecloud-eemail--account/' ${BASE_DIR}/apps/settings/templates/help.php -RUN sed -i 's/https:\/\/help.nextcloud.com/https:\/\/community.e.foundation/' ${BASE_DIR}/apps/settings/templates/help.php +RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/009-help-links.patch b/patches/009-help-links.patch new file mode 100644 index 00000000..f95fa73d --- /dev/null +++ b/patches/009-help-links.patch @@ -0,0 +1,74 @@ +From: Akhil +Date: Thu, 10 Aug 2021 17:30:00 +0530 +Subject: [PATCH] Changes help links to point to the correct links + +This patch adds changes to the "Settings" app's help template, controller and stylesheet to make sure the correct +help links are shown + +--- ./apps/settings/lib/Controller/HelpController.php 2021-08-10 16:54:15.844898527 +0530 ++++ ./apps/settings/lib/Controller/HelpController-new.php 2021-08-10 16:54:42.541807384 +0530 +@@ -89,7 +89,8 @@ + 'url' => $documentationUrl, + 'urlUserDocs' => $urlUserDocs, + 'urlAdminDocs' => $urlAdminDocs, +- 'mode' => $mode, ++ 'mode' => $mode, ++ 'ncVersion' => \OCP\Util::getVersion()[0] + ]); + $policy = new ContentSecurityPolicy(); + $policy->addAllowedFrameDomain('\'self\''); +--- ./apps/settings/templates/help.php 2021-07-01 15:13:08.000000000 +0530 ++++ ./apps/settings/templates/help-new.php 2021-08-10 17:22:42.771569854 +0530 +@@ -4,37 +4,21 @@ + + +
+- +
+--- ./apps/settings/css/help.css 2021-08-10 17:24:46.764507147 +0530 ++++ ./apps/settings/css/help-new.css 2021-08-10 17:25:14.631108134 +0530 +@@ -10,3 +10,7 @@ + border: 0; + overflow: auto; + } ++ ++#app-navigation.without-app-settings { ++ width: max-content; ++} -- GitLab From e1b0af4d55d0875d3feaf2b48d63adaf05bbbbda Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 12 Aug 2021 19:46:33 +0530 Subject: [PATCH 06/34] Added app store upgrade disabling --- Dockerfile | 1 + patches/010-disable-app-store-upgrade.patch | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 patches/010-disable-app-store-upgrade.patch diff --git a/Dockerfile b/Dockerfile index caa9c56d..568de1f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -102,6 +102,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 patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/010-disable-app-store-upgrade.patch b/patches/010-disable-app-store-upgrade.patch new file mode 100644 index 00000000..0810c6e2 --- /dev/null +++ b/patches/010-disable-app-store-upgrade.patch @@ -0,0 +1,21 @@ +From: Akhil +Date: Thu, 12 Aug 2021 19:45:00 +0530 +Subject: [PATCH] Disables app store checking during "occ upgrade" + +This patch disables checking the app store for app updates during "occ upgrade" + +--- ./lib/private/Updater.php 2021-08-11 19:46:04.607195791 +0530 ++++ ./lib/private/Updater-new.php 2021-08-11 19:46:15.173946740 +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); -- GitLab From 3812264f9a544887965387e7d9984d609a3d181a Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 16 Aug 2021 20:42:48 +0530 Subject: [PATCH 07/34] 20.0.12 + app version updates; disabled dark theme --- Dockerfile | 9 +++++---- patches/011-disable-dark-theme.patch | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 patches/011-disable-dark-theme.patch diff --git a/Dockerfile b/Dockerfile index 568de1f6..6f4894c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM nextcloud:20.0.11-fpm +FROM nextcloud:20.0.12-fpm ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="20.1.0-beta" ARG THEME_HELPER_VERSION="1.0.0-beta" -ARG NEWS_VERSION="16.0.0" +ARG NEWS_VERSION="16.0.1" ARG QUOTA_WARN_VERSION="1.9.1" -ARG NOTES_VERSION="4.1.0" +ARG NOTES_VERSION="4.1.1" ARG CONTACTS_VERSION="4.0.1" ARG CALENDAR_VERSION="2.3.1" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.0" @@ -13,7 +13,7 @@ ARG EMAIL_RECOVERY_JOB_ID="162557" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-20" -ARG ECLOUD_LAUNCHER_JOB_ID="188715" +ARG ECLOUD_LAUNCHER_JOB_ID="190389" RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ ${TMP_PATCH_DIR}/ @@ -103,6 +103,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR 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 patch -u ${BASE_DIR}/apps/accessibility/lib/AccessibilityProvider.php -i ${TMP_PATCH_DIR}/011-disable-dark-theme.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/011-disable-dark-theme.patch b/patches/011-disable-dark-theme.patch new file mode 100644 index 00000000..69f846f0 --- /dev/null +++ b/patches/011-disable-dark-theme.patch @@ -0,0 +1,24 @@ +From: Akhil +Date: Thu, 16 Aug 2021 20:30:00 +0530 +Subject: [PATCH] Disables dark theme + +This patch disables dark theme in accessibility settings +--- ./apps/accessibility/lib/AccessibilityProvider.php 2021-08-16 20:24:07.196051259 +0530 ++++ ./apps/accessibility/lib/AccessibilityProvider-new.php 2021-08-16 20:24:54.609377114 +0530 +@@ -59,15 +59,7 @@ + } + + public function getThemes() { +- return [ +- [ +- 'id' => 'dark', +- 'img' => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'), +- 'title' => $this->l->t('Dark theme'), +- 'enableLabel' => $this->l->t('Enable dark theme'), +- 'text' => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.') +- ] +- ]; ++ return []; + } + + public function getHighContrast() { -- GitLab From 8e71675a32e27c84b5cf752e418fb5e4fc02077c Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 17 Aug 2021 17:47:18 +0530 Subject: [PATCH 08/34] Added beta2 versions of theme, helper and launcher --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f4894c9..2dfa732c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM nextcloud:20.0.12-fpm ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="20.1.0-beta" -ARG THEME_HELPER_VERSION="1.0.0-beta" +ARG THEME_VERSION="20.1.0-beta2" +ARG THEME_HELPER_VERSION="1.0.0-beta2" ARG NEWS_VERSION="16.0.1" ARG QUOTA_WARN_VERSION="1.9.1" ARG NOTES_VERSION="4.1.1" @@ -13,13 +13,13 @@ ARG EMAIL_RECOVERY_JOB_ID="162557" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-20" -ARG ECLOUD_LAUNCHER_JOB_ID="190389" +ARG ECLOUD_LAUNCHER_JOB_ID="192224" 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,11,1/20,0,11,6/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,11,1/20,0,11,7/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From dd37fccf074ef3e01fa19bc09ce27ae09db71f1b Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 17 Aug 2021 17:51:40 +0530 Subject: [PATCH 09/34] Updated version number in sed to 20,0,12,1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2dfa732c..db6482ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ 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,11,1/20,0,11,7/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,1/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 031237a91cae98c6d4a4187b7c7118ea68e70901 Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 20 Aug 2021 17:38:08 +0530 Subject: [PATCH 10/34] Removed app content div and fixed css for help in patch --- Dockerfile | 2 +- patches/009-help-links.patch | 49 +++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index db6482ed..53408080 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ 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,1/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,2/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip diff --git a/patches/009-help-links.patch b/patches/009-help-links.patch index f95fa73d..17c408f8 100644 --- a/patches/009-help-links.patch +++ b/patches/009-help-links.patch @@ -19,35 +19,38 @@ help links are shown $policy->addAllowedFrameDomain('\'self\''); --- ./apps/settings/templates/help.php 2021-07-01 15:13:08.000000000 +0530 +++ ./apps/settings/templates/help-new.php 2021-08-10 17:22:42.771569854 +0530 -@@ -4,37 +4,21 @@ +@@ -3,38 +3,21 @@ + ?> -
+-
- -
---- ./apps/settings/css/help.css 2021-08-10 17:24:46.764507147 +0530 -+++ ./apps/settings/css/help-new.css 2021-08-10 17:25:14.631108134 +0530 -@@ -10,3 +10,7 @@ - border: 0; - overflow: auto; +-
+ +--- ./apps/settings/css/help.css 2021-08-20 14:16:57.951439620 +0530 ++++ ./apps/settings/css/help-new.css 2021-08-20 17:02:43.549016337 +0530 +@@ -10,3 +10,12 @@ + border: 0; + overflow: auto; } + -+#app-navigation.without-app-settings { -+ width: max-content; ++#content #app-navigation { ++ transform: none; ++ width: max-content; ++} ++ ++#app-navigation:not(.vue) > ul > li > a { ++ padding: 0 12px 0 44px; +} -- GitLab From 0a1d0e21b88c89ecd636edf25d56d763078dd3ec Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 23 Aug 2021 12:43:11 +0530 Subject: [PATCH 11/34] Updated launcher job id to latest; updated theme link to master --- Dockerfile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53408080..3e52ba50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG EMAIL_RECOVERY_JOB_ID="162557" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-20" -ARG ECLOUD_LAUNCHER_JOB_ID="192224" +ARG ECLOUD_LAUNCHER_JOB_ID="192863" RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ ${TMP_PATCH_DIR}/ @@ -113,10 +113,18 @@ RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIV RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/anyof/allof/g' js/calendar.js # Custom theme +#RUN curl -fsSL -o eelo-theme.tar.gz \ +# "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ +# tar -xf eelo-theme.tar.gz -C /tmp/ && \ +# mv /tmp/nextcloud-theme-${THEME_VERSION}/eelo ${BASE_DIR}/themes/ && \ +# chown -R www-data:www-data ${BASE_DIR}/themes/eelo/ && \ +# rm -rf eelo-theme.tar.gz /tmp/nextcloud-theme-* ${BASE_DIR}/themes/example/ + +# Temporarily pointing to master RUN curl -fsSL -o eelo-theme.tar.gz \ - "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ + "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/master/nextcloud-theme-master.tar.gz" && \ tar -xf eelo-theme.tar.gz -C /tmp/ && \ - mv /tmp/nextcloud-theme-${THEME_VERSION}/eelo ${BASE_DIR}/themes/ && \ + mv /tmp/nextcloud-theme-master/eelo ${BASE_DIR}/themes/ && \ chown -R www-data:www-data ${BASE_DIR}/themes/eelo/ && \ rm -rf eelo-theme.tar.gz /tmp/nextcloud-theme-* ${BASE_DIR}/themes/example/ -- GitLab From d544af6360f9d3dba8fcd2051d9bb0d0f1f94d85 Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 23 Aug 2021 13:02:11 +0530 Subject: [PATCH 12/34] Added space between /e/ and documentation --- patches/009-help-links.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/009-help-links.patch b/patches/009-help-links.patch index 17c408f8..6d5032f7 100644 --- a/patches/009-help-links.patch +++ b/patches/009-help-links.patch @@ -50,7 +50,7 @@ help links are shown - - t('Documentation')); ?> ↗ + -+ t('Documentation')); ?> ↗ ++ t('Documentation')); ?> ↗
  • -- GitLab From 9534cdf4d841bdb1bd56367455a7924ef2f29690 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 24 Aug 2021 20:38:06 +0530 Subject: [PATCH 13/34] Added check in custom entrypoint to disable code integrity check --- custom_entrypoint.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index ba562110..f1a18c19 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -11,6 +11,23 @@ SRC_DIR="/usr/src/nextcloud" DST_DIR="/var/www/html" installed_version="0.0.0.0" + +#!/bin/bash +CONFIG_FILE = "$DST_DIR/config/config.php" +# If key already exists in config array but is set to false, set it to true +sed -i 's/\s*'\''integrity.check.disabled'\''\s*=>\s*false/'\''integrity.check.disabled'\'' => true/' $CONFIG_FILE + +# If no key-value pair set to true exists, add it at the end of the config file +if ! grep -q "'integrity.check.disabled'\s*=>\s*true" $CONFIG_FILE; then + # Check if PHP array ends with a comma + if cat $CONFIG_FILE | tr '\n' ' ' | grep -q ', );'; then + sed -z 's/\n);/\n'\''integrity.check.disabled'\'' => true,\n);/' -i $CONFIG_FILE + else + sed -z 's/\n);/,\n'\''integrity.check.disabled'\'' => true,\n);/' -i $CONFIG_FILE + fi +fi + + if [ -f /var/www/html/version.php ]; then installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')" fi -- GitLab From 748a1d6b25d07dc72325dd337136e429c0463cdb Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 24 Aug 2021 20:39:40 +0530 Subject: [PATCH 14/34] Ran formatter --- custom_entrypoint.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index f1a18c19..f50003a4 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -19,15 +19,14 @@ sed -i 's/\s*'\''integrity.check.disabled'\''\s*=>\s*false/'\''integrity.check.d # If no key-value pair set to true exists, add it at the end of the config file if ! grep -q "'integrity.check.disabled'\s*=>\s*true" $CONFIG_FILE; then - # Check if PHP array ends with a comma - if cat $CONFIG_FILE | tr '\n' ' ' | grep -q ', );'; then - sed -z 's/\n);/\n'\''integrity.check.disabled'\'' => true,\n);/' -i $CONFIG_FILE - else - sed -z 's/\n);/,\n'\''integrity.check.disabled'\'' => true,\n);/' -i $CONFIG_FILE - fi + # Check if PHP array ends with a comma + if cat $CONFIG_FILE | tr '\n' ' ' | grep -q ', );'; then + sed -z 's/\n);/\n'\''integrity.check.disabled'\'' => true,\n);/' -i $CONFIG_FILE + else + sed -z 's/\n);/,\n'\''integrity.check.disabled'\'' => true,\n);/' -i $CONFIG_FILE + fi fi - if [ -f /var/www/html/version.php ]; then installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')" fi -- GitLab From e15b7320573ff2d9b61a67d4fb64104633eaa0e9 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 24 Aug 2021 20:40:41 +0530 Subject: [PATCH 15/34] Removed bin/bash line --- custom_entrypoint.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index f50003a4..b14d798c 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -12,7 +12,6 @@ DST_DIR="/var/www/html" installed_version="0.0.0.0" -#!/bin/bash CONFIG_FILE = "$DST_DIR/config/config.php" # If key already exists in config array but is set to false, set it to true sed -i 's/\s*'\''integrity.check.disabled'\''\s*=>\s*false/'\''integrity.check.disabled'\'' => true/' $CONFIG_FILE -- GitLab From ca179291318658a661d9dc7f2cd229c0c83ddf76 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 24 Aug 2021 20:49:20 +0530 Subject: [PATCH 16/34] Fixed variable assignment --- custom_entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index b14d798c..f13b59a8 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -12,7 +12,7 @@ DST_DIR="/var/www/html" installed_version="0.0.0.0" -CONFIG_FILE = "$DST_DIR/config/config.php" +CONFIG_FILE="$DST_DIR/config/config.php" # If key already exists in config array but is set to false, set it to true sed -i 's/\s*'\''integrity.check.disabled'\''\s*=>\s*false/'\''integrity.check.disabled'\'' => true/' $CONFIG_FILE -- GitLab From 36a2e238b51745e36755985dd8037875b75ef413 Mon Sep 17 00:00:00 2001 From: akhil Date: Wed, 25 Aug 2021 17:16:16 +0530 Subject: [PATCH 17/34] Added occ commands to set integrity.check.disabled to true --- custom_entrypoint.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index f13b59a8..92e3310b 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -12,20 +12,6 @@ DST_DIR="/var/www/html" installed_version="0.0.0.0" -CONFIG_FILE="$DST_DIR/config/config.php" -# If key already exists in config array but is set to false, set it to true -sed -i 's/\s*'\''integrity.check.disabled'\''\s*=>\s*false/'\''integrity.check.disabled'\'' => true/' $CONFIG_FILE - -# If no key-value pair set to true exists, add it at the end of the config file -if ! grep -q "'integrity.check.disabled'\s*=>\s*true" $CONFIG_FILE; then - # Check if PHP array ends with a comma - if cat $CONFIG_FILE | tr '\n' ' ' | grep -q ', );'; then - sed -z 's/\n);/\n'\''integrity.check.disabled'\'' => true,\n);/' -i $CONFIG_FILE - else - sed -z 's/\n);/,\n'\''integrity.check.disabled'\'' => true,\n);/' -i $CONFIG_FILE - fi -fi - if [ -f /var/www/html/version.php ]; then installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')" fi @@ -53,10 +39,12 @@ 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 ecloud-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 config:system:set integrity.check.disabled --value='true' --type=boolean" 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:disable ecloud-theme-helper" + sh -c "php $DST_DIR/occ config:system:set integrity.check.disabled --value='true' --type=boolean" fi /entrypoint.sh "$@" -- GitLab From 0773fce6f5a1395816e070bcf34db687865c8c62 Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 2 Sep 2021 15:21:31 +0530 Subject: [PATCH 18/34] rc1 theme, helper and launcher added --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e52ba50..9a215b7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM nextcloud:20.0.12-fpm ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="20.1.0-beta2" -ARG THEME_HELPER_VERSION="1.0.0-beta2" +ARG THEME_VERSION="20.1.0-rc1" +ARG THEME_HELPER_VERSION="1.0.0-rc1" ARG NEWS_VERSION="16.0.1" ARG QUOTA_WARN_VERSION="1.9.1" ARG NOTES_VERSION="4.1.1" @@ -13,13 +13,13 @@ ARG EMAIL_RECOVERY_JOB_ID="162557" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-20" -ARG ECLOUD_LAUNCHER_JOB_ID="192863" +ARG ECLOUD_LAUNCHER_JOB_ID="196869" 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,2/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,3/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 2e8cac33b8b7728674048be65982cadc47a94dab Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 2 Sep 2021 15:27:14 +0530 Subject: [PATCH 19/34] Used launcher release tag and switched back to custom theme release link --- Dockerfile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9a215b7f..870ebea4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG EMAIL_RECOVERY_JOB_ID="162557" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-20" -ARG ECLOUD_LAUNCHER_JOB_ID="196869" +ARG ECLOUD_LAUNCHER_TAG"1.0.0-rc1" RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ ${TMP_PATCH_DIR}/ @@ -80,7 +80,7 @@ RUN curl -fsSL -o ecloud-theme-helper.tar.gz \ rm ecloud-theme-helper.tar.gz; RUN curl -fsSL -o ecloud-launcher.zip \ - "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/launcher/-/jobs/${ECLOUD_LAUNCHER_JOB_ID}/artifacts/download" && \ + "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/launcher/-/jobs/artifacts/${ECLOUD_LAUNCHER_TAG}/download?job=build-frontend" && \ unzip ecloud-launcher.zip && \ mv dist/ecloud-launcher ${BASE_DIR}/custom_apps/ && \ rm ecloud-launcher.zip; @@ -113,18 +113,10 @@ RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIV RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/anyof/allof/g' js/calendar.js # Custom theme -#RUN curl -fsSL -o eelo-theme.tar.gz \ -# "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ -# tar -xf eelo-theme.tar.gz -C /tmp/ && \ -# mv /tmp/nextcloud-theme-${THEME_VERSION}/eelo ${BASE_DIR}/themes/ && \ -# chown -R www-data:www-data ${BASE_DIR}/themes/eelo/ && \ -# rm -rf eelo-theme.tar.gz /tmp/nextcloud-theme-* ${BASE_DIR}/themes/example/ - -# Temporarily pointing to master RUN curl -fsSL -o eelo-theme.tar.gz \ - "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/master/nextcloud-theme-master.tar.gz" && \ + "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ tar -xf eelo-theme.tar.gz -C /tmp/ && \ - mv /tmp/nextcloud-theme-master/eelo ${BASE_DIR}/themes/ && \ + mv /tmp/nextcloud-theme-${THEME_VERSION}/eelo ${BASE_DIR}/themes/ && \ chown -R www-data:www-data ${BASE_DIR}/themes/eelo/ && \ rm -rf eelo-theme.tar.gz /tmp/nextcloud-theme-* ${BASE_DIR}/themes/example/ -- GitLab From 706d8825d9b781bdbd41a00030ab7ca30b20d981 Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 2 Sep 2021 15:39:26 +0530 Subject: [PATCH 20/34] Reverted to launcher job ids --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 870ebea4..984d4eda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG EMAIL_RECOVERY_JOB_ID="162557" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-20" -ARG ECLOUD_LAUNCHER_TAG"1.0.0-rc1" +ARG ECLOUD_LAUNCHER_JOB_ID="196872" RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ ${TMP_PATCH_DIR}/ @@ -80,7 +80,7 @@ RUN curl -fsSL -o ecloud-theme-helper.tar.gz \ rm ecloud-theme-helper.tar.gz; RUN curl -fsSL -o ecloud-launcher.zip \ - "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/launcher/-/jobs/artifacts/${ECLOUD_LAUNCHER_TAG}/download?job=build-frontend" && \ + "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/launcher/-/jobs/${ECLOUD_LAUNCHER_JOB_ID}/artifacts/download" && \ unzip ecloud-launcher.zip && \ mv dist/ecloud-launcher ${BASE_DIR}/custom_apps/ && \ rm ecloud-launcher.zip; -- GitLab From 13c96bb0903d734fd6abce8668ec9f7852ad6bf5 Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 2 Sep 2021 15:44:08 +0530 Subject: [PATCH 21/34] Re-enabled dark theme(it cannot be disabled by existing users otherwise) --- Dockerfile | 1 - patches/011-disable-dark-theme.patch | 24 ------------------------ 2 files changed, 25 deletions(-) delete mode 100644 patches/011-disable-dark-theme.patch diff --git a/Dockerfile b/Dockerfile index 984d4eda..ce5e826b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -103,7 +103,6 @@ RUN patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR 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 patch -u ${BASE_DIR}/apps/accessibility/lib/AccessibilityProvider.php -i ${TMP_PATCH_DIR}/011-disable-dark-theme.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/011-disable-dark-theme.patch b/patches/011-disable-dark-theme.patch deleted file mode 100644 index 69f846f0..00000000 --- a/patches/011-disable-dark-theme.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Akhil -Date: Thu, 16 Aug 2021 20:30:00 +0530 -Subject: [PATCH] Disables dark theme - -This patch disables dark theme in accessibility settings ---- ./apps/accessibility/lib/AccessibilityProvider.php 2021-08-16 20:24:07.196051259 +0530 -+++ ./apps/accessibility/lib/AccessibilityProvider-new.php 2021-08-16 20:24:54.609377114 +0530 -@@ -59,15 +59,7 @@ - } - - public function getThemes() { -- return [ -- [ -- 'id' => 'dark', -- 'img' => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'), -- 'title' => $this->l->t('Dark theme'), -- 'enableLabel' => $this->l->t('Enable dark theme'), -- 'text' => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.') -- ] -- ]; -+ return []; - } - - public function getHighContrast() { -- GitLab From 5199686ab72e5eeca4bb34433e8b6fb144bf2a2a Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 3 Sep 2021 16:50:12 +0530 Subject: [PATCH 22/34] Updated contacts and calendar versions --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ce5e826b..a541afa5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ ARG THEME_HELPER_VERSION="1.0.0-rc1" ARG NEWS_VERSION="16.0.1" ARG QUOTA_WARN_VERSION="1.9.1" ARG NOTES_VERSION="4.1.1" -ARG CONTACTS_VERSION="4.0.1" -ARG CALENDAR_VERSION="2.3.1" +ARG CONTACTS_VERSION="4.0.2" +ARG CALENDAR_VERSION="2.3.3" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.0" ARG EMAIL_RECOVERY_JOB_ID="162557" ARG RAINLOOP_VERSION="7.1.2" @@ -19,7 +19,7 @@ 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,3/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,4/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 0e993616d440c14ce281b38eba3bf5d00aa8ffbf Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 3 Sep 2021 19:08:53 +0530 Subject: [PATCH 23/34] Set default widgets --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index a541afa5..db0bbd05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -111,6 +111,9 @@ RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIV 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 recommendations, calendar and notes +RUN sed -i 's/recommendations,spreed,mail,calendar/recommendations,calendar,notes/' ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php + # Custom theme RUN curl -fsSL -o eelo-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ -- GitLab From 12d4b9f88f62c48ed7ed20528fedbaf36ddc97cd Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 7 Sep 2021 17:53:48 +0530 Subject: [PATCH 24/34] Added patch for privacy settings --- Dockerfile | 1 + patches/011-privacy-settings.patch | 37 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 patches/011-privacy-settings.patch diff --git a/Dockerfile b/Dockerfile index db0bbd05..55144153 100644 --- a/Dockerfile +++ b/Dockerfile @@ -103,6 +103,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR 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 rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch new file mode 100644 index 00000000..26647694 --- /dev/null +++ b/patches/011-privacy-settings.patch @@ -0,0 +1,37 @@ +--- ./apps/privacy/lib/Settings/MissionSettings.php 2021-09-07 17:38:08.650902445 +0530 ++++ ./apps/privacy/lib/Settings/MissionSettings-new.php 2021-09-07 17:40:30.078256502 +0530 +@@ -41,8 +41,8 @@ + /** + * @return string + */ +- public function getSection():string { +- return 'privacy'; ++ public function getSection() { ++ return null; + } + + /** +--- ./apps/privacy/lib/Settings/UserDataManifestoSettings.php 2021-09-07 17:38:06.284224253 +0530 ++++ ./apps/privacy/lib/Settings/UserDataManifestoSettings-new.php 2021-09-07 17:40:42.288315736 +0530 +@@ -41,8 +41,8 @@ + /** + * @return string + */ +- public function getSection():string { +- return 'privacy'; ++ public function getSection() { ++ return null; + } + + /** +--- ./apps/privacy/templates/who-has-access.php 2021-09-07 17:40:05.704804878 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2021-09-07 17:40:02.714790363 +0530 +@@ -1,3 +1,8 @@ ++ ++ +
    +

    t('Who has access to your data?')) ?>

    +

    t('Administrators')); ?>

    -- GitLab From 086bc7df005e93e3ca91c8302877360cfcb50d07 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 7 Sep 2021 19:24:01 +0530 Subject: [PATCH 25/34] added rc2 tags --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55144153..5914d461 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM nextcloud:20.0.12-fpm ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="20.1.0-rc1" -ARG THEME_HELPER_VERSION="1.0.0-rc1" +ARG THEME_VERSION="20.1.0-rc2" +ARG THEME_HELPER_VERSION="1.0.0-rc2" ARG NEWS_VERSION="16.0.1" ARG QUOTA_WARN_VERSION="1.9.1" ARG NOTES_VERSION="4.1.1" @@ -13,13 +13,13 @@ ARG EMAIL_RECOVERY_JOB_ID="162557" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-20" -ARG ECLOUD_LAUNCHER_JOB_ID="196872" +ARG ECLOUD_LAUNCHER_JOB_ID="198198" 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,4/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,5/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From ef3dfd2936373c3d9445ebfcf355f033072f6dca Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 7 Sep 2021 19:46:25 +0530 Subject: [PATCH 26/34] Bumped version number to deploy rc2 again(with contenteditable fix) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5914d461..68bb022e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ 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,5/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,6/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 302f98e3d0c31415f034153850f3c7e1d2470cda Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 9 Sep 2021 17:00:04 +0530 Subject: [PATCH 27/34] Added sed to remove email template logo bg --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 68bb022e..8d0f90fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -115,6 +115,9 @@ RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/anyof/allof/g' js/calendar. # Set default widgets to recommendations, calendar and notes RUN sed -i 's/recommendations,spreed,mail,calendar/recommendations,calendar,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 + # Custom theme RUN curl -fsSL -o eelo-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ -- GitLab From f28e7789d00eead2900fc0aa0cb05942484cdf1c Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 10 Sep 2021 19:12:19 +0530 Subject: [PATCH 28/34] Set default widgets to calendar tasks and notes --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d0f90fc..b923cb00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,8 +112,8 @@ RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIV 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 recommendations, calendar and notes -RUN sed -i 's/recommendations,spreed,mail,calendar/recommendations,calendar,notes/' ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php +# 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 -- GitLab From 26302bbc026d6eb687bdbe948430df1cf8f6765a Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 13 Sep 2021 17:26:10 +0530 Subject: [PATCH 29/34] added rc3 versions --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b923cb00..28bd88c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM nextcloud:20.0.12-fpm ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="20.1.0-rc2" -ARG THEME_HELPER_VERSION="1.0.0-rc2" +ARG THEME_VERSION="20.1.0-rc3" +ARG THEME_HELPER_VERSION="1.0.0-rc3" ARG NEWS_VERSION="16.0.1" ARG QUOTA_WARN_VERSION="1.9.1" ARG NOTES_VERSION="4.1.1" @@ -13,7 +13,7 @@ ARG EMAIL_RECOVERY_JOB_ID="162557" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-20" -ARG ECLOUD_LAUNCHER_JOB_ID="198198" +ARG ECLOUD_LAUNCHER_JOB_ID="199516" RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab From d3b6949f9c106ff592ed224742fc2fd32d4e2e1f Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 13 Sep 2021 17:26:36 +0530 Subject: [PATCH 30/34] Bumped version to 20,0,12,7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28bd88c1..958ae558 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ 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,6/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,7/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 533351c7f8f8d75c386fe2a49aa6c57e6db0eec2 Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 13 Sep 2021 19:32:16 +0530 Subject: [PATCH 31/34] Renamed theme to eCloud --- Dockerfile | 17 +++++++++-------- custom_entrypoint.sh | 4 +++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 958ae558..a011ef81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ 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,7/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,8/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip @@ -88,8 +88,8 @@ RUN curl -fsSL -o ecloud-launcher.zip \ # Remove unzip when unzipping is done RUN apt-get -y remove unzip -# force eelo theme not to be disabled even when there is an upgrade process launched -RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('theme', 'eelo');/g" ${BASE_DIR}/lib/base.php +# force eCloud theme not to be disabled even when there is an upgrade process launched +RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('theme', 'eCloud');/g" ${BASE_DIR}/lib/base.php # Patches RUN patch -u ${BASE_DIR}/core/Controller/LoginController.php -i ${TMP_PATCH_DIR}/002-login-without-domain.patch @@ -119,12 +119,13 @@ RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php # Custom theme -RUN curl -fsSL -o eelo-theme.tar.gz \ +RUN curl -fsSL -o eCloud-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ - tar -xf eelo-theme.tar.gz -C /tmp/ && \ - mv /tmp/nextcloud-theme-${THEME_VERSION}/eelo ${BASE_DIR}/themes/ && \ - chown -R www-data:www-data ${BASE_DIR}/themes/eelo/ && \ - rm -rf eelo-theme.tar.gz /tmp/nextcloud-theme-* ${BASE_DIR}/themes/example/ + tar -xf eCloud-theme.tar.gz -C /tmp/ && \ + mkdir ${BASE_DIR}/themes/eCloud && \ + mv /tmp/nextcloud-theme-${THEME_VERSION}/* ${BASE_DIR}/themes/eCloud/ && \ + chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ + rm -rf eCloud-theme.tar.gz /tmp/nextcloud-theme-* ${BASE_DIR}/themes/example/ ENTRYPOINT ["/custom_entrypoint.sh"] CMD ["php-fpm"] diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 92e3310b..540b541f 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -30,7 +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 "/eelo/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ + rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ else echo "Skipping rsync step as version not updated!" fi @@ -40,11 +40,13 @@ if [ "$(id -u)" = 0 ]; then su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-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 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:disable ecloud-theme-helper" 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 "$@" -- GitLab From 37bf91ea42fd9237da63ac22050dad90c681ef1e Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 13 Sep 2021 21:17:12 +0530 Subject: [PATCH 32/34] added trailing slashes to rsync; Directly copied theme folder to destination --- Dockerfile | 5 ++--- custom_entrypoint.sh | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index a011ef81..c695de9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -122,10 +122,9 @@ RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this-> RUN curl -fsSL -o eCloud-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ tar -xf eCloud-theme.tar.gz -C /tmp/ && \ - mkdir ${BASE_DIR}/themes/eCloud && \ - mv /tmp/nextcloud-theme-${THEME_VERSION}/* ${BASE_DIR}/themes/eCloud/ && \ + mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ - rm -rf eCloud-theme.tar.gz /tmp/nextcloud-theme-* ${BASE_DIR}/themes/example/ + rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ ENTRYPOINT ["/custom_entrypoint.sh"] CMD ["php-fpm"] diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 540b541f..36dfb301 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -24,11 +24,11 @@ if version_greater "$image_version" "$installed_version"; then 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/ - rsync $rsync_options --include "/rainloop" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ - rsync $rsync_options --include "/email-recovery" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ - rsync $rsync_options --include "/ecloud_drop_account" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ - 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 "/rainloop/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ + rsync $rsync_options --include "/email-recovery/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ + rsync $rsync_options --include "/ecloud_drop_account/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ + 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 "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ else -- GitLab From b0bbe97fa287b34608795e9d2c5e6288e3ec7259 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 14 Sep 2021 13:12:03 +0530 Subject: [PATCH 33/34] Added most recent email-recovery job id --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c695de9c..c97e5236 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG NOTES_VERSION="4.1.1" ARG CONTACTS_VERSION="4.0.2" ARG CALENDAR_VERSION="2.3.3" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.0" -ARG EMAIL_RECOVERY_JOB_ID="162557" +ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-20" -- GitLab From bd8d13afe8e84583bd1ee670f7e4657c2f3633fb Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 14 Sep 2021 13:12:34 +0530 Subject: [PATCH 34/34] Bumped version number for changes to be seen --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c97e5236..0fe9c7be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ 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,8/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,9/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab