From bce70125404a546add17d068bb39c106664ab3b1 Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 8 Jul 2022 17:04:36 +0530 Subject: [PATCH 1/3] Update versions and job ids --- Dockerfile | 12 ++++++------ ...user-setting.patch => 018-occ-user-setting.patch} | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename patches/{019-occ-user-setting.patch => 018-occ-user-setting.patch} (100%) diff --git a/Dockerfile b/Dockerfile index e089885c..5c187efb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,23 @@ FROM nextcloud:22.2.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="22.1.2" -ARG THEME_HELPER_VERSION="1.3.1" +ARG THEME_VERSION="22.1.3" +ARG THEME_HELPER_VERSION="1.3.2" ARG NEWS_VERSION="18.0.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.3.1" ARG CONTACTS_JOB_ID="329486" -ARG CALENDAR_JOB_ID="329481" +ARG CALENDAR_JOB_ID="344794" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="313915" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_TAG="2.0.2" -ARG ECLOUD_LAUNCHER_JOB_ID="318040" +ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,8,1/22,2,8,27/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,8,1/22,2,8,28/' ${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 @@ -127,7 +127,7 @@ RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/01 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.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/Authentication/Listeners/UserDeletedFilesCleanupListener.php -i ${TMP_PATCH_DIR}/017-storage-wrapper.patch -RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/019-occ-user-setting.patch +RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/019-occ-user-setting.patch b/patches/018-occ-user-setting.patch similarity index 100% rename from patches/019-occ-user-setting.patch rename to patches/018-occ-user-setting.patch -- GitLab From d457dc47cbdd409721795ea864f452694cd13d1a Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 8 Jul 2022 18:13:29 +0530 Subject: [PATCH 2/3] Remove storage wrapper patch --- Dockerfile | 5 ++--- patches/017-storage-wrapper.patch | 22 ---------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 patches/017-storage-wrapper.patch diff --git a/Dockerfile b/Dockerfile index 5c187efb..6f07cd3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.3" ARG THEME_HELPER_VERSION="1.3.2" -ARG NEWS_VERSION="18.0.1" +ARG NEWS_VERSION="18.1.0" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.3.1" ARG CONTACTS_JOB_ID="329486" @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,8,1/22,2,8,28/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,9,1/22,2,9,1/' ${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 @@ -126,7 +126,6 @@ RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/014-add-mail-usage.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.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/Authentication/Listeners/UserDeletedFilesCleanupListener.php -i ${TMP_PATCH_DIR}/017-storage-wrapper.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN rm -rf ${TMP_PATCH_DIR} diff --git a/patches/017-storage-wrapper.patch b/patches/017-storage-wrapper.patch deleted file mode 100644 index 0d2c900f..00000000 --- a/patches/017-storage-wrapper.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php 2022-05-27 12:40:13.680838300 +0530 -+++ ./lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener-new.php 2022-05-27 12:41:07.530838300 +0530 -@@ -26,6 +26,7 @@ - namespace OC\Authentication\Listeners; - - use OC\Files\Cache\Cache; -+use OC\Files\Storage\Wrapper\Wrapper; - use OCP\EventDispatcher\Event; - use OCP\EventDispatcher\IEventListener; - use OCP\Files\Config\IMountProviderCollection; -@@ -56,6 +57,11 @@ - if (!$storage) { - throw new \Exception("User has no home storage"); - } -+ // remove all wrappers, so we do the delete directly on the home storage bypassing any wrapper -+ while ($storage->instanceOfStorage(Wrapper::class)) { -+ /** @var Wrapper $storage */ -+ $storage = $storage->getWrapperStorage(); -+ } - $this->homeStorageCache[$event->getUser()->getUID()] = $storage; - } - if ($event instanceof UserDeletedEvent) { -- GitLab From c2917cf3a5444408396ad8a32fbba34f2bf645db Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 11 Jul 2022 13:14:53 +0530 Subject: [PATCH 3/3] 22.2.9-fpm --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6f07cd3d..08ce93b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:22.2.8-fpm AS nextcloud +FROM nextcloud:22.2.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.3" -- GitLab