From 13e260e7b92858196aaa213c86a635e761e8e6db Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 4 Jan 2023 16:28:43 +0530 Subject: [PATCH 01/10] Add ldap pwd check optimization as patch --- Dockerfile | 1 + patches/023-ldap-check-pwd-optimization.patch | 73 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 patches/023-ldap-check-pwd-optimization.patch diff --git a/Dockerfile b/Dockerfile index 61de9750..31306d8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -163,6 +163,7 @@ RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete- 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 patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch +RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch RUN rm -rf ${TMP_PATCH_DIR} RUN curl -fsSL -o ldap_write_support.tar.gz \ diff --git a/patches/023-ldap-check-pwd-optimization.patch b/patches/023-ldap-check-pwd-optimization.patch new file mode 100644 index 00000000..ef70b563 --- /dev/null +++ b/patches/023-ldap-check-pwd-optimization.patch @@ -0,0 +1,73 @@ +From: Akhil +Date: Wed, 04 Jan 2023 16:24 +0530 +Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce number of LDAP binds and SQL UPDATE operations per password check + +--- ./apps/user_ldap/lib/User_LDAP.php 2023-01-04 16:20:02.747181606 +0530 ++++ ./apps/user_ldap/lib/User_LDAP-new.php 2023-01-04 16:22:34.282504132 +0530 +@@ -114,11 +114,12 @@ + * @return string|false + * @throws \Exception + */ +- public function loginName2UserName($loginName) { ++ public function loginName2UserName($loginName, bool $overrideCacheIfFalse = false) { + $cacheKey = 'loginName2UserName-' . $loginName; + $username = $this->access->connection->getFromCache($cacheKey); + +- if ($username !== null) { ++ $overrideCache = $overrideCacheIfFalse && $username === false; ++ if ($username !== null && !$overrideCache) { + return $username; + } + +@@ -176,39 +177,27 @@ + * @return false|string + */ + public function checkPassword($uid, $password) { +- try { +- $ldapRecord = $this->getLDAPUserByLoginName($uid); +- } catch (NotOnLDAP $e) { +- $this->logger->debug( +- $e->getMessage(), +- ['app' => 'user_ldap', 'exception' => $e] +- ); ++ $username = $this->loginName2UserName($uid, true); ++ if(!$username) { + return false; + } +- $dn = $ldapRecord['dn'][0]; +- $user = $this->access->userManager->get($dn); + +- if (!$user instanceof User) { +- $this->logger->warning( +- 'LDAP Login: Could not get user object for DN ' . $dn . +- '. Maybe the LDAP entry has no set display name attribute?', +- ['app' => 'user_ldap'] +- ); +- return false; +- } +- if ($user->getUsername() !== false) { +- //are the credentials OK? +- if (!$this->access->areCredentialsValid($dn, $password)) { ++ $dn = $this->access->username2dn($username); ++ //are the credentials OK? ++ if ($dn && $this->access->areCredentialsValid($dn, $password)) { ++ $user = $this->access->userManager->get($username); ++ if (!$user instanceof User) { ++ $this->logger->warning( ++ 'LDAP Login: Could not get user object for DN ' . $dn . ++ '. Maybe the LDAP entry has no set display name attribute?', ++ ['app' => 'user_ldap'] ++ ); + return false; + } +- + $this->access->cacheUserExists($user->getUsername()); +- $user->processAttributes($ldapRecord); + $user->markLogin(); +- + return $user->getUsername(); + } +- + return false; + } + -- GitLab From ffe1e2c53e6240255098fae48411625daa975501 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 4 Jan 2023 16:28:58 +0530 Subject: [PATCH 02/10] Bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 31306d8d..1234f1fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="458901" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/24,0,8,2/24,0,8,4/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,8,2/24,0,8,5/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab From 366f67933fa6389cc33b79f342ee33e1625401d8 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 4 Jan 2023 16:36:52 +0530 Subject: [PATCH 03/10] Remove few apps from image --- Dockerfile | 31 +++++++++---------------------- custom_entrypoint.sh | 2 -- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1234f1fb..22fa7506 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,9 @@ FROM nextcloud:24.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="446245" -ARG NEWS_VERSION="19.0.0" -ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" -ARG CONTACTS_JOB_ID="400045" -ARG CALENDAR_JOB_ID="435164" -ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" +ARG CONTACTS_JOB_ID="471108" +ARG CALENDAR_JOB_ID="471116" ARG EMAIL_RECOVERY_JOB_ID="445958" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" @@ -23,17 +20,6 @@ RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -# Custom apps -RUN curl -fsSL -o news.tar.gz \ - "https://github.com/nextcloud/news/releases/download/${NEWS_VERSION}/news.tar.gz" && \ - tar -xf news.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - rm news.tar.gz; - -RUN curl -fsSL -o quota_warning.tar.gz \ - "https://github.com/nextcloud-releases/quota_warning/releases/download/v${QUOTA_WARN_VERSION}/quota_warning-v${QUOTA_WARN_VERSION}.tar.gz" && \ - tar -xf quota_warning.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - rm quota_warning.tar.gz; - RUN curl -fsSL -o notes.tar.gz \ "https://github.com/nextcloud/notes/releases/download/v${NOTES_VERSION}/notes.tar.gz" && \ tar -xf notes.tar.gz -C ${BASE_DIR}/custom_apps/ && \ @@ -46,18 +32,12 @@ RUN curl -fsSL -o contacts.zip \ mv dist/contacts ${BASE_DIR}/custom_apps/ && \ rm contacts.zip; -# custom Calendar 3.2.4 RUN curl -fsSL -o calendar.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/calendar/-/jobs/${CALENDAR_JOB_ID}/artifacts/download" && \ unzip calendar.zip && \ mv dist/calendar ${BASE_DIR}/custom_apps/ && \ rm calendar.zip; -RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ - "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \ - tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - rm user_backend_sql_raw.tar.gz; - RUN curl -fsSL -o email-recovery.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/email-recovery/-/jobs/${EMAIL_RECOVERY_JOB_ID}/artifacts/download" && \ unzip email-recovery.zip && \ @@ -108,6 +88,7 @@ From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="selfhost-22.0.0" +ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -136,6 +117,12 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ +# User Backend +RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ + "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \ + tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + rm user_backend_sql_raw.tar.gz; + # Set default class of hidden to settings-hint RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php # change notifications icon src diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index caaf8d8b..4155970b 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -18,9 +18,7 @@ fi image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')" if version_greater "$image_version" "$installed_version"; then - rsync $rsync_options --include "/news/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/notes/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ - rsync $rsync_options --include "/quota_warning/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/calendar/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/contacts/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/user_backend_sql_raw/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ -- GitLab From ed7de050161b8794ac1dd39a8a521e5c7967e582 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 4 Jan 2023 16:45:07 +0530 Subject: [PATCH 04/10] Remove patches to dashboard app --- Dockerfile | 4 ---- patches/012-remove-user-status-widget.patch | 18 ------------------ 2 files changed, 22 deletions(-) delete mode 100644 patches/012-remove-user-status-widget.patch diff --git a/Dockerfile b/Dockerfile index 22fa7506..64bdf678 100644 --- a/Dockerfile +++ b/Dockerfile @@ -147,7 +147,6 @@ RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003- 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 -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch @@ -181,9 +180,6 @@ 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-main.js RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[a,"displayname"\]},//' js/calendar-main.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 diff --git a/patches/012-remove-user-status-widget.patch b/patches/012-remove-user-status-widget.patch deleted file mode 100644 index 40e0d3a5..00000000 --- a/patches/012-remove-user-status-widget.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Akhil -Date: Fri, 17 Sep 2021 13:00 +0530 -Subject: [PATCH] Removes user status widget from Dashboard - -This patch removes user status widget from available widgets in dashboard - ---- DashboardController.php 2021-09-17 12:56:19.691685082 +0530 -+++ DashboardController-new.php 2021-09-17 12:59:18.906502554 +0530 -@@ -108,6 +108,9 @@ - '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 51eca56d292c0518b51d35a5f92a21d22b2b1ad7 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 4 Jan 2023 17:20:53 +0530 Subject: [PATCH 05/10] Update app job ids --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 64bdf678..9ad8afdb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM nextcloud:24.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="446245" +ARG THEME_HELPER_JOB_ID="460343" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="471108" ARG CALENDAR_JOB_ID="471116" ARG EMAIL_RECOVERY_JOB_ID="445958" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_JOB_ID="445966" +ARG EA_JOB_ID="460260" ARG ECLOUD_LAUNCHER_JOB_ID="458901" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -- GitLab From 83f9d7b91e653a738bd37925d56fbb5859cf4497 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 4 Jan 2023 17:27:11 +0530 Subject: [PATCH 06/10] Update rainloop version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9ad8afdb..299b8129 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG CONTACTS_JOB_ID="471108" ARG CALENDAR_JOB_ID="471116" ARG EMAIL_RECOVERY_JOB_ID="445958" ARG RAINLOOP_VERSION="7.2.5" -ARG RAINLOOP_COMMIT_SHA="523518ba" +ARG RAINLOOP_COMMIT_SHA="28a5d603" ARG EA_JOB_ID="460260" ARG ECLOUD_LAUNCHER_JOB_ID="458901" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -- GitLab From d1ad3f70f5916a0060d6141efbbef1aff2d0ccef Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 4 Jan 2023 17:35:47 +0530 Subject: [PATCH 07/10] Update job ids again --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 299b8129..54fac749 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM nextcloud:24.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="460343" +ARG THEME_HELPER_JOB_ID="471836" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="471108" ARG CALENDAR_JOB_ID="471116" ARG EMAIL_RECOVERY_JOB_ID="445958" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="28a5d603" -ARG EA_JOB_ID="460260" +ARG EA_JOB_ID="471828" ARG ECLOUD_LAUNCHER_JOB_ID="458901" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -- GitLab From 364992928bb62a93a6f4d84227c049487f466b38 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 4 Jan 2023 20:02:06 +0530 Subject: [PATCH 08/10] Fix variable names --- patches/023-ldap-check-pwd-optimization.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/023-ldap-check-pwd-optimization.patch b/patches/023-ldap-check-pwd-optimization.patch index ef70b563..e03a811e 100644 --- a/patches/023-ldap-check-pwd-optimization.patch +++ b/patches/023-ldap-check-pwd-optimization.patch @@ -9,13 +9,13 @@ Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce n * @throws \Exception */ - public function loginName2UserName($loginName) { -+ public function loginName2UserName($loginName, bool $overrideCacheIfFalse = false) { ++ public function loginName2UserName($loginName, bool $ignoreCacheIfFalseFound = false) { $cacheKey = 'loginName2UserName-' . $loginName; $username = $this->access->connection->getFromCache($cacheKey); - if ($username !== null) { -+ $overrideCache = $overrideCacheIfFalse && $username === false; -+ if ($username !== null && !$overrideCache) { ++ $forceLdapFetch = ($username === false && $ignoreCacheIfFalseFound); ++ if ($username !== null && !$forceLdapFetch) { return $username; } -- GitLab From a7acb34b89eb67c0d7a497bbad50c515bb2995c6 Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 17 Jan 2023 19:25:46 +0530 Subject: [PATCH 09/10] Update patch --- patches/023-ldap-check-pwd-optimization.patch | 56 +++++++------------ 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/patches/023-ldap-check-pwd-optimization.patch b/patches/023-ldap-check-pwd-optimization.patch index e03a811e..60bbe61d 100644 --- a/patches/023-ldap-check-pwd-optimization.patch +++ b/patches/023-ldap-check-pwd-optimization.patch @@ -3,23 +3,33 @@ Date: Wed, 04 Jan 2023 16:24 +0530 Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce number of LDAP binds and SQL UPDATE operations per password check --- ./apps/user_ldap/lib/User_LDAP.php 2023-01-04 16:20:02.747181606 +0530 -+++ ./apps/user_ldap/lib/User_LDAP-new.php 2023-01-04 16:22:34.282504132 +0530 ++++ ./apps/user_ldap/lib/User_LDAP-new.php 2023-01-17 19:22:51.776857415 +0530 @@ -114,11 +114,12 @@ * @return string|false * @throws \Exception */ - public function loginName2UserName($loginName) { -+ public function loginName2UserName($loginName, bool $ignoreCacheIfFalseFound = false) { ++ public function loginName2UserName($loginName, bool $forceLdapRefetch = false) { $cacheKey = 'loginName2UserName-' . $loginName; $username = $this->access->connection->getFromCache($cacheKey); - if ($username !== null) { -+ $forceLdapFetch = ($username === false && $ignoreCacheIfFalseFound); -+ if ($username !== null && !$forceLdapFetch) { ++ $ignoreCache = ($username === false && $forceLdapRefetch); ++ if ($username !== null && !$ignoreCache) { return $username; } -@@ -176,39 +177,27 @@ +@@ -133,6 +134,9 @@ + } + $username = $user->getUsername(); + $this->access->connection->writeToCache($cacheKey, $username); ++ if($forceLdapRefetch) { ++ $user->processAttributes($ldapRecord); ++ } + return $username; + } catch (NotOnLDAP $e) { + $this->access->connection->writeToCache($cacheKey, false); +@@ -176,16 +180,11 @@ * @return false|string */ public function checkPassword($uid, $password) { @@ -35,39 +45,15 @@ Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce n return false; } - $dn = $ldapRecord['dn'][0]; -- $user = $this->access->userManager->get($dn); - -- if (!$user instanceof User) { -- $this->logger->warning( -- 'LDAP Login: Could not get user object for DN ' . $dn . -- '. Maybe the LDAP entry has no set display name attribute?', -- ['app' => 'user_ldap'] -- ); -- return false; -- } -- if ($user->getUsername() !== false) { -- //are the credentials OK? -- if (!$this->access->areCredentialsValid($dn, $password)) { + $dn = $this->access->username2dn($username); -+ //are the credentials OK? -+ if ($dn && $this->access->areCredentialsValid($dn, $password)) { -+ $user = $this->access->userManager->get($username); -+ if (!$user instanceof User) { -+ $this->logger->warning( -+ 'LDAP Login: Could not get user object for DN ' . $dn . -+ '. Maybe the LDAP entry has no set display name attribute?', -+ ['app' => 'user_ldap'] -+ ); - return false; + $user = $this->access->userManager->get($dn); + + if (!$user instanceof User) { +@@ -203,7 +202,6 @@ } -- + $this->access->cacheUserExists($user->getUsername()); - $user->processAttributes($ldapRecord); $user->markLogin(); -- - return $user->getUsername(); - } -- - return false; - } + return $user->getUsername(); -- GitLab From 4548f890b8a586d5a098fed3e080fd7406e2d9b5 Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 17 Jan 2023 22:41:55 +0530 Subject: [PATCH 10/10] Bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 54fac749..ac0ec03f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="458901" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/24,0,8,2/24,0,8,5/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,8,2/24,0,8,6/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab