From 1d062278e5b97b53569aa42fdc3d467598c75b66 Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 31 Oct 2022 19:31:44 +0530 Subject: [PATCH 01/19] Selfhost builds auto-build --- .gitlab-ci.yml | 44 +++++++++++++++++++++++------- Dockerfile | 73 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 82 insertions(+), 35 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e9fa46e..3be72010 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,23 +10,49 @@ 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 +.build-docker: + 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$SUBPATH:$CI_COMMIT_REF_SLUG" . + - docker push "$CI_REGISTRY_IMAGE$SUBPATH:$CI_COMMIT_REF_SLUG" + build-branch: - except: - - tags stage: build - script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" + variables: + TARGET: ecloud + SUBPATH: '' + only: + - branches + extends: .build-docker + +build-branch-selfhost: + stage: build + variables: + TARGET: selfhost + SUBPATH: '/selfhost' + only: + - branches + when: manual + extends: .build-docker build-tag: + stage: build + variables: + TARGET: ecloud + SUBPATH: '' only: - tags + extends: .build-docker + +build-tag-selfhost: stage: build - script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" . - - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" + variables: + TARGET: selfhost + SUBPATH: '/selfhost' + only: + - tags + extends: .build-docker diff --git a/Dockerfile b/Dockerfile index d6abb495..7ac4e4cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,14 @@ FROM nextcloud:23.0.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="22.1.5" +ARG THEME_VERSION="23.0.1" +ARG SELFHOST_THEME_VERSION="selfhost-22.0.0" ARG THEME_HELPER_VERSION="1.4.4" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" -ARG CALENDAR_JOB_ID="414851" +ARG CALENDAR_JOB_ID="413645" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="389385" ARG RAINLOOP_VERSION="7.2.5" @@ -97,15 +98,6 @@ RUN curl -fsSL -o ecloud-accounts.tar.gz \ mv "${BASE_DIR}/custom_apps/ecloud-accounts-${EA_TAG}" "${BASE_DIR}/custom_apps/ecloud-accounts" && \ rm ecloud-accounts.tar.gz; -RUN curl -fsSL -o ldap_write_support.tar.gz \ - "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \ - tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \ - rm ldap_write_support.tar.gz - -RUN curl -fsSL -o oidc_login.tar.gz \ - "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${OIDC_LOGIN_VERSION}/oidc_login.tar.gz" && \ - tar -xf oidc_login.tar.gz -C ${BASE_DIR}/custom_apps && \ - rm oidc_login.tar.gz # Remove unzip when unzipping is done RUN apt-get -y remove unzip @@ -113,13 +105,16 @@ RUN apt-get -y remove unzip # 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 +ENTRYPOINT ["/custom_entrypoint.sh"] +CMD ["php-fpm"] + +From nextcloud as selfhost +ARG BASE_DIR="/usr/src/nextcloud" +ARG TMP_PATCH_DIR="/tmp/build_patches" + # Patches COPY patches/ ${TMP_PATCH_DIR}/ RUN cd ${BASE_DIR} && patch -p0 < ${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 @@ -127,17 +122,51 @@ 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 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 patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch 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 -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php -i ${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}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch -RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN rm -rf ${TMP_PATCH_DIR} +# Custom theme +RUN curl -fsSL -o eCloud-theme.tar.gz \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${SELFHOST_THEME_VERSION}/nextcloud-theme-${SELFHOST_THEME_VERSION}.tar.gz" && \ + tar -xf eCloud-theme.tar.gz -C /tmp/ && \ + 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 ${BASE_DIR}/themes/example/ + +# Replace "Get your own free account" NC link with /e/ Account link in public pages +RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php +# 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 + +From selfhost as ecloud +ARG BASE_DIR="/usr/src/nextcloud" +ARG TMP_PATCH_DIR="/tmp/build_patches" +# Patches +COPY patches/ ${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 -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 rm -rf ${TMP_PATCH_DIR} + +RUN curl -fsSL -o ldap_write_support.tar.gz \ + "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \ + tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \ + rm ldap_write_support.tar.gz + +RUN curl -fsSL -o oidc_login.tar.gz \ + "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${OIDC_LOGIN_VERSION}/oidc_login.tar.gz" && \ + tar -xf oidc_login.tar.gz -C ${BASE_DIR}/custom_apps && \ + rm oidc_login.tar.gz + # show reset pwd page with a query param RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' login.js @@ -176,15 +205,7 @@ 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/ -# Replace "Get your own free account" NC link with /e/ Account link in public pages -RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php - -# 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 - # Seds to fix displayname save regression RUN sed -i "s/'email' ||/'email'/" ${BASE_DIR}/apps/settings/js/federationsettingsview.js RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js -ENTRYPOINT ["/custom_entrypoint.sh"] -CMD ["php-fpm"] -- GitLab From 0a04262a2a932c2aaf6805f01bf18a99864fb0fd Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 31 Oct 2022 19:41:38 +0530 Subject: [PATCH 02/19] fix theme --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7ac4e4cf..748d5799 100644 --- a/Dockerfile +++ b/Dockerfile @@ -134,7 +134,7 @@ RUN rm -rf ${TMP_PATCH_DIR} RUN curl -fsSL -o eCloud-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${SELFHOST_THEME_VERSION}/nextcloud-theme-${SELFHOST_THEME_VERSION}.tar.gz" && \ tar -xf eCloud-theme.tar.gz -C /tmp/ && \ - mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ + mv /tmp/nextcloud-theme-${SELFHOST_THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ -- GitLab From 65ca0d5365bf097926452139a11551292c1cf6a9 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 9 Nov 2022 14:26:27 +0530 Subject: [PATCH 03/19] Fix theme links --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 748d5799..a8911e9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,6 @@ FROM nextcloud:23.0.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="23.0.1" -ARG SELFHOST_THEME_VERSION="selfhost-22.0.0" ARG THEME_HELPER_VERSION="1.4.4" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" @@ -111,6 +109,7 @@ CMD ["php-fpm"] From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" +ARG SELFHOST_THEME_VERSION="selfhost-22.0.0" # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -146,6 +145,8 @@ RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/tem From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" +ARG THEME_VERSION="23.0.1" + # Patches COPY patches/ ${TMP_PATCH_DIR}/ RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch -- GitLab From 6b24469c6e3c5c1995986898f17390005945ca8a Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 9 Nov 2022 14:44:18 +0530 Subject: [PATCH 04/19] Add versions in ecloud build --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8911e9e..9c0115e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,6 @@ ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_TAG="2.1.1" ARG ECLOUD_LAUNCHER_JOB_ID="389373" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -ARG OIDC_LOGIN_VERSION="2.3.3" RUN sed -i 's/23,0,9,1/23,0,9,19/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / @@ -146,6 +144,8 @@ From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="23.0.1" +ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" +ARG OIDC_LOGIN_VERSION="2.3.3" # Patches COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab From e3b0dbf95ef6c9516d92fabc717adb11dc88c9cb Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 16 Nov 2022 13:34:17 +0000 Subject: [PATCH 05/19] Revert "Merge branch 'selfhosted-builds' into 'main'" --- .gitlab-ci.yml | 44 ++++++---------------------- Dockerfile | 78 ++++++++++++++++++-------------------------------- 2 files changed, 37 insertions(+), 85 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3be72010..1e9fa46e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,49 +10,23 @@ 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 -.build-docker: - 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$SUBPATH:$CI_COMMIT_REF_SLUG" . - - docker push "$CI_REGISTRY_IMAGE$SUBPATH:$CI_COMMIT_REF_SLUG" - build-branch: + except: + - tags stage: build - variables: - TARGET: ecloud - SUBPATH: '' - only: - - branches - extends: .build-docker - -build-branch-selfhost: - stage: build - variables: - TARGET: selfhost - SUBPATH: '/selfhost' - only: - - branches - when: manual - extends: .build-docker + script: + - docker build --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 - SUBPATH: '' only: - tags - extends: .build-docker - -build-tag-selfhost: stage: build - variables: - TARGET: selfhost - SUBPATH: '/selfhost' - only: - - tags - extends: .build-docker + script: + - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" . + - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" diff --git a/Dockerfile b/Dockerfile index 9c0115e4..d6abb495 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,13 @@ FROM nextcloud:23.0.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" +ARG THEME_VERSION="22.1.5" ARG THEME_HELPER_VERSION="1.4.4" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" -ARG CALENDAR_JOB_ID="413645" +ARG CALENDAR_JOB_ID="414851" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="389385" ARG RAINLOOP_VERSION="7.2.5" @@ -14,6 +15,8 @@ ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_TAG="2.1.1" ARG ECLOUD_LAUNCHER_JOB_ID="389373" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" +ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" +ARG OIDC_LOGIN_VERSION="2.3.3" RUN sed -i 's/23,0,9,1/23,0,9,19/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / @@ -94,6 +97,15 @@ RUN curl -fsSL -o ecloud-accounts.tar.gz \ mv "${BASE_DIR}/custom_apps/ecloud-accounts-${EA_TAG}" "${BASE_DIR}/custom_apps/ecloud-accounts" && \ rm ecloud-accounts.tar.gz; +RUN curl -fsSL -o ldap_write_support.tar.gz \ + "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \ + tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \ + rm ldap_write_support.tar.gz + +RUN curl -fsSL -o oidc_login.tar.gz \ + "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${OIDC_LOGIN_VERSION}/oidc_login.tar.gz" && \ + tar -xf oidc_login.tar.gz -C ${BASE_DIR}/custom_apps && \ + rm oidc_login.tar.gz # Remove unzip when unzipping is done RUN apt-get -y remove unzip @@ -101,17 +113,13 @@ RUN apt-get -y remove unzip # 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 -ENTRYPOINT ["/custom_entrypoint.sh"] -CMD ["php-fpm"] - -From nextcloud as selfhost -ARG BASE_DIR="/usr/src/nextcloud" -ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG SELFHOST_THEME_VERSION="selfhost-22.0.0" - # Patches COPY patches/ ${TMP_PATCH_DIR}/ RUN cd ${BASE_DIR} && patch -p0 < ${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 @@ -119,55 +127,17 @@ 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 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 patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch 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 -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php -i ${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}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch -RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch -RUN rm -rf ${TMP_PATCH_DIR} - -# Custom theme -RUN curl -fsSL -o eCloud-theme.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${SELFHOST_THEME_VERSION}/nextcloud-theme-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf eCloud-theme.tar.gz -C /tmp/ && \ - mv /tmp/nextcloud-theme-${SELFHOST_THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ - chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ - rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ - -# Replace "Get your own free account" NC link with /e/ Account link in public pages -RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php -# 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 - -From selfhost as ecloud -ARG BASE_DIR="/usr/src/nextcloud" -ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="23.0.1" -ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -ARG OIDC_LOGIN_VERSION="2.3.3" - -# Patches -COPY patches/ ${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 -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 patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN rm -rf ${TMP_PATCH_DIR} -RUN curl -fsSL -o ldap_write_support.tar.gz \ - "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \ - tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \ - rm ldap_write_support.tar.gz - -RUN curl -fsSL -o oidc_login.tar.gz \ - "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${OIDC_LOGIN_VERSION}/oidc_login.tar.gz" && \ - tar -xf oidc_login.tar.gz -C ${BASE_DIR}/custom_apps && \ - rm oidc_login.tar.gz - # show reset pwd page with a query param RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' login.js @@ -206,7 +176,15 @@ 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/ +# Replace "Get your own free account" NC link with /e/ Account link in public pages +RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php + +# 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 + # Seds to fix displayname save regression RUN sed -i "s/'email' ||/'email'/" ${BASE_DIR}/apps/settings/js/federationsettingsview.js RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js +ENTRYPOINT ["/custom_entrypoint.sh"] +CMD ["php-fpm"] -- GitLab From 40d211f50e95d768fb20272272407d224c61d34c Mon Sep 17 00:00:00 2001 From: AVINASH GUSAIN Date: Wed, 16 Nov 2022 16:22:37 +0000 Subject: [PATCH 06/19] update to nextcloud 23.0.11 --- Dockerfile | 47 ++++++++++++---------- patches/015-email-mail-template.patch | 58 +++++++++++---------------- patches/022-significantchange.patch | 17 ++++++++ 3 files changed, 67 insertions(+), 55 deletions(-) create mode 100644 patches/022-significantchange.patch diff --git a/Dockerfile b/Dockerfile index d6abb495..b7e6f8d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,24 @@ -FROM nextcloud:23.0.9-fpm AS nextcloud +FROM nextcloud:23.0.11-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="22.1.5" -ARG THEME_HELPER_VERSION="1.4.4" -ARG NEWS_VERSION="18.1.1" -ARG QUOTA_WARN_VERSION="1.14.0" +ARG THEME_VERSION="23.0.3" +ARG THEME_HELPER_JOB_ID="433795" +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="414851" +ARG CALENDAR_JOB_ID="435164" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="389385" +ARG EMAIL_RECOVERY_JOB_ID="433031" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_TAG="2.1.1" -ARG ECLOUD_LAUNCHER_JOB_ID="389373" +ARG EA_JOB_ID="433303" +ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,9,1/23,0,9,19/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,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 @@ -72,12 +72,11 @@ RUN curl -fsSL -o rainloop.tar.gz \ mv "${BASE_DIR}/custom_apps/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}" "${BASE_DIR}/custom_apps/rainloop" && \ rm rainloop.tar.gz; - -RUN curl -fsSL -o ecloud-theme-helper.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/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-theme-helper.tar.gz; +RUN curl -fsSL -o ecloud-theme-helper.zip \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-theme-helper/-/jobs/${THEME_HELPER_JOB_ID}/artifacts/download" && \ + unzip ecloud-theme-helper.zip && \ + mv dist/ecloud-theme-helper ${BASE_DIR}/custom_apps/ && \ + rm ecloud-theme-helper.zip; RUN curl -fsSL -o murena_launcher.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/launcher/-/jobs/${ECLOUD_LAUNCHER_JOB_ID}/artifacts/download" && \ @@ -91,11 +90,11 @@ RUN curl -fsSL -o integration_google.tar.gz \ chown -R www-data:www-data ${BASE_DIR}/custom_apps/integration_google && \ rm integration_google.tar.gz; -RUN curl -fsSL -o ecloud-accounts.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-accounts/-/archive/${EA_TAG}/ecloud-accounts-${EA_TAG}.tar.gz" && \ - tar -xf ecloud-accounts.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - mv "${BASE_DIR}/custom_apps/ecloud-accounts-${EA_TAG}" "${BASE_DIR}/custom_apps/ecloud-accounts" && \ - rm ecloud-accounts.tar.gz; +RUN curl -fsSL -o ecloud-accounts.zip \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-accounts/-/jobs/${EA_JOB_ID}/artifacts/download" && \ + unzip ecloud-accounts.zip && \ + mv dist/ecloud-accounts ${BASE_DIR}/custom_apps/ && \ + rm ecloud-accounts.zip; RUN curl -fsSL -o ldap_write_support.tar.gz \ "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \ @@ -144,6 +143,9 @@ RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1|| # hide oidc login button RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$context->registerAlternativeLogin(OIDCLoginOption::class);/' ${BASE_DIR}/custom_apps/oidc_login/lib/AppInfo/Application.php +# change notifications icon src +RUN sed -i 's/(0,Pd.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js + # sed version of ldap_write_support RUN cd ${BASE_DIR}/custom_apps/ldap_write_support && sed -i 's/max-version="22"/max-version="23"/' appinfo/info.xml @@ -168,6 +170,9 @@ RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_ #replace error class in schedule response error file to fix error color RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-error.php +# Remove 'fix broken values of calendar objects' repair step +RUN sed -i '/OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE_DIR}/apps/dav/appinfo/info.xml + # Custom theme RUN curl -fsSL -o eCloud-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index f654c784..72af74d7 100644 --- a/patches/015-email-mail-template.patch +++ b/patches/015-email-mail-template.patch @@ -1,25 +1,15 @@ ---- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-10-26 11:45:19.589156800 +0530 -+++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-10-26 15:28:50.269156800 +0530 -@@ -151,15 +151,6 @@ - */ - public function schedule(Message $iTipMessage) { - -- // Not sending any emails if the system considers the update -- // insignificant. -- if (!$iTipMessage->significantChange) { -- if (!$iTipMessage->scheduleStatus) { -- $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email'; -- } -- return; -- } -- - $summary = $iTipMessage->message->VEVENT->SUMMARY; - - if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') { -@@ -252,7 +243,21 @@ - +From: Avinash +Date: Tue, 15 Nov 2022 12:50 +0530 +Subject: [PATCH] To implement custom email template design for calendar invite + +This patch is allowing to customize the email template design for invitation + +--- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-11-10 10:39:19.134653000 +0530 ++++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-11-11 12:28:15.829119700 +0530 +@@ -252,7 +252,21 @@ + $summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event'); - + - $this->addSubjectAndHeading($template, $l10n, $method, $summary); + if ( count($vevent)>1) { + $this->addSubjectAndHeadingUpdated($template, $l10n, $method, $summary); @@ -37,17 +27,17 @@ + $template->addHeadingBanner('#EFFFDB','#293618',$l10n->t('This event has been updated, please review the information below:')); + } $this->addBulletList($template, $l10n, $vevent); - + // Only add response buttons to invitation requests: Fix Issue #11230 -@@ -516,6 +521,7 @@ +@@ -516,6 +530,7 @@ return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d'); } - + + /** * @param IEMailTemplate $template * @param IL10N $l10n -@@ -542,24 +548,86 @@ +@@ -542,24 +557,86 @@ /** * @param IEMailTemplate $template * @param IL10N $l10n @@ -89,7 +79,8 @@ + $lastmodified=$dtstampTime; + $selectedEvent = $currentevent; + } -+ } + } +- $meetingWhen = $this->generateWhenString($l10n, $vevent); + if ($selectedEvent->SUMMARY) { + if (trim($selectedEvent->SUMMARY) == trim($parentevent->SUMMARY)) { + $template->addBodyListItem($selectedEvent->SUMMARY, $l10n->t('Title:'), @@ -98,8 +89,7 @@ + $template->addBodyListItemModified($selectedEvent->SUMMARY, $l10n->t('Updated Title:'), + $this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT); + } - } -- $meetingWhen = $this->generateWhenString($l10n, $vevent); ++ } + $meetingWhen = $this->generateWhenString($l10n, $selectedEvent); if ($meetingWhen) { - $template->addBodyListItem($meetingWhen, $l10n->t('Time:'), @@ -145,7 +135,7 @@ $template->addBodyListItem(sprintf('%s', htmlspecialchars($url), htmlspecialchars($url)), -@@ -567,13 +635,16 @@ +@@ -567,13 +644,16 @@ $this->getAbsoluteImagePath('caldav/link.png'), $url,'',self::IMIP_INDENT); } @@ -167,17 +157,17 @@ + } } } - -@@ -662,7 +733,7 @@ + +@@ -662,7 +742,7 @@ Message $iTipMessage, $lastOccurrence) { $token = $this->createInvitationToken($iTipMessage, $lastOccurrence); - + - $template->addBodyButtonGroup( + $template->addBodyButtonGroupTentative( $l10n->t('Accept'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [ 'token' => $token, -@@ -670,18 +741,10 @@ +@@ -670,18 +750,10 @@ $l10n->t('Decline'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ 'token' => $token, @@ -197,5 +187,5 @@ - - $template->addBodyText($html, $text); } - + /** diff --git a/patches/022-significantchange.patch b/patches/022-significantchange.patch new file mode 100644 index 00000000..8040a53c --- /dev/null +++ b/patches/022-significantchange.patch @@ -0,0 +1,17 @@ +From: Avinash +Date: Tue, 15 Nov 2022 12:50 +0530 +Subject: [PATCH] To allow significant change to send mail for summary and description change + +This patch is allowing to to send mail for summary and description change + +--- ./3rdparty/sabre/vobject/lib/ITip/Broker.php 2022-09-06 21:39:42.985827300 +0530 ++++ ./3rdparty/sabre/vobject/lib/ITip/Broker-New.php 2022-11-11 12:45:53.449119700 +0530 +@@ -75,6 +75,8 @@ + 'RDATE', + 'EXDATE', + 'STATUS', ++ 'SUMMARY', ++ 'DESCRIPTION', + ]; + + /** -- GitLab From cb03df8f02c5a82819ae669f24417ef4623d9a4a Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 31 Oct 2022 19:31:44 +0530 Subject: [PATCH 07/19] Selfhost builds auto-build --- .gitlab-ci.yml | 44 +++++++++++++++++++++++++------- Dockerfile | 68 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 79 insertions(+), 33 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e9fa46e..3be72010 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,23 +10,49 @@ 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 +.build-docker: + 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$SUBPATH:$CI_COMMIT_REF_SLUG" . + - docker push "$CI_REGISTRY_IMAGE$SUBPATH:$CI_COMMIT_REF_SLUG" + build-branch: - except: - - tags stage: build - script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" + variables: + TARGET: ecloud + SUBPATH: '' + only: + - branches + extends: .build-docker + +build-branch-selfhost: + stage: build + variables: + TARGET: selfhost + SUBPATH: '/selfhost' + only: + - branches + when: manual + extends: .build-docker build-tag: + stage: build + variables: + TARGET: ecloud + SUBPATH: '' only: - tags + extends: .build-docker + +build-tag-selfhost: stage: build - script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" . - - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" + variables: + TARGET: selfhost + SUBPATH: '/selfhost' + only: + - tags + extends: .build-docker diff --git a/Dockerfile b/Dockerfile index b7e6f8d9..3597d8fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,15 +96,6 @@ RUN curl -fsSL -o ecloud-accounts.zip \ mv dist/ecloud-accounts ${BASE_DIR}/custom_apps/ && \ rm ecloud-accounts.zip; -RUN curl -fsSL -o ldap_write_support.tar.gz \ - "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \ - tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \ - rm ldap_write_support.tar.gz - -RUN curl -fsSL -o oidc_login.tar.gz \ - "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${OIDC_LOGIN_VERSION}/oidc_login.tar.gz" && \ - tar -xf oidc_login.tar.gz -C ${BASE_DIR}/custom_apps && \ - rm oidc_login.tar.gz # Remove unzip when unzipping is done RUN apt-get -y remove unzip @@ -112,13 +103,16 @@ RUN apt-get -y remove unzip # 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 +ENTRYPOINT ["/custom_entrypoint.sh"] +CMD ["php-fpm"] + +From nextcloud as selfhost +ARG BASE_DIR="/usr/src/nextcloud" +ARG TMP_PATCH_DIR="/tmp/build_patches" + # Patches COPY patches/ ${TMP_PATCH_DIR}/ RUN cd ${BASE_DIR} && patch -p0 < ${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 @@ -126,17 +120,51 @@ 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 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 patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch 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 -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php -i ${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}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch -RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN rm -rf ${TMP_PATCH_DIR} +# Custom theme +RUN curl -fsSL -o eCloud-theme.tar.gz \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${SELFHOST_THEME_VERSION}/nextcloud-theme-${SELFHOST_THEME_VERSION}.tar.gz" && \ + tar -xf eCloud-theme.tar.gz -C /tmp/ && \ + 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 ${BASE_DIR}/themes/example/ + +# Replace "Get your own free account" NC link with /e/ Account link in public pages +RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php +# 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 + +From selfhost as ecloud +ARG BASE_DIR="/usr/src/nextcloud" +ARG TMP_PATCH_DIR="/tmp/build_patches" +# Patches +COPY patches/ ${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 -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 rm -rf ${TMP_PATCH_DIR} + +RUN curl -fsSL -o ldap_write_support.tar.gz \ + "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \ + tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \ + rm ldap_write_support.tar.gz + +RUN curl -fsSL -o oidc_login.tar.gz \ + "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${OIDC_LOGIN_VERSION}/oidc_login.tar.gz" && \ + tar -xf oidc_login.tar.gz -C ${BASE_DIR}/custom_apps && \ + rm oidc_login.tar.gz + # show reset pwd page with a query param RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' login.js @@ -181,15 +209,7 @@ 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/ -# Replace "Get your own free account" NC link with /e/ Account link in public pages -RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php - -# 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 - # Seds to fix displayname save regression RUN sed -i "s/'email' ||/'email'/" ${BASE_DIR}/apps/settings/js/federationsettingsview.js RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js -ENTRYPOINT ["/custom_entrypoint.sh"] -CMD ["php-fpm"] -- GitLab From 0e0464638014e0122c2a42e46b4980ed4df6a956 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 9 Nov 2022 14:26:27 +0530 Subject: [PATCH 08/19] Fix theme links --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 3597d8fe..5020bdc7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -109,6 +109,7 @@ CMD ["php-fpm"] From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" +ARG SELFHOST_THEME_VERSION="selfhost-22.0.0" # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -144,6 +145,8 @@ RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/tem From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" +ARG THEME_VERSION="23.0.1" + # Patches COPY patches/ ${TMP_PATCH_DIR}/ RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch -- GitLab From 4475bf2562cba98d741c96bd2dd1797082cfcebb Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 9 Nov 2022 14:44:18 +0530 Subject: [PATCH 09/19] Add versions in ecloud build --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5020bdc7..e610c7b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,6 @@ ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_JOB_ID="433303" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -ARG OIDC_LOGIN_VERSION="2.3.3" RUN sed -i 's/23,0,11,1/23,0,11,6/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / @@ -146,6 +144,8 @@ From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="23.0.1" +ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" +ARG OIDC_LOGIN_VERSION="2.3.3" # Patches COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab From 662b71420425dc084dc9e339bb57e70a0f44024a Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 17 Nov 2022 13:39:14 +0530 Subject: [PATCH 10/19] Use selfhost-22.1.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e610c7b4..816b7b50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -107,7 +107,7 @@ CMD ["php-fpm"] From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG SELFHOST_THEME_VERSION="selfhost-22.0.0" +ARG SELFHOST_THEME_VERSION="selfhost-22.1.5" # Patches COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab From 57435f54e11ca1f015151aba3cb92bd76f6ddb7d Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 17 Nov 2022 13:41:50 +0530 Subject: [PATCH 11/19] Use selfhost-22.1.5 --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 816b7b50..d70a3785 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ FROM nextcloud:23.0.11-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="23.0.3" ARG THEME_HELPER_JOB_ID="433795" ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" @@ -143,7 +142,7 @@ RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/tem From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="23.0.1" +ARG THEME_VERSION="23.0.3" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -- GitLab From efbf9e6170d99655ff902f40e4c86b2f657b31a6 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 17 Nov 2022 13:54:00 +0530 Subject: [PATCH 12/19] Use same variable name for theme --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d70a3785..64db2be3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -106,7 +106,7 @@ CMD ["php-fpm"] From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG SELFHOST_THEME_VERSION="selfhost-22.1.5" +ARG THEME_VERSION="selfhost-22.1.5" # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -128,7 +128,7 @@ RUN rm -rf ${TMP_PATCH_DIR} # Custom theme RUN curl -fsSL -o eCloud-theme.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${SELFHOST_THEME_VERSION}/nextcloud-theme-${SELFHOST_THEME_VERSION}.tar.gz" && \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ tar -xf eCloud-theme.tar.gz -C /tmp/ && \ mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ -- GitLab From 7437d012395c0b1ad4a81ff1536c35f2127297ee Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 17 Nov 2022 14:07:01 +0530 Subject: [PATCH 13/19] Bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 64db2be3..a1225523 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG EA_JOB_ID="433303" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/23,0,11,1/23,0,11,6/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,7/' ${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 87fe7cc7e35d2dd5e44ba41423017bf1a854dc7b Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 17 Nov 2022 17:56:43 +0530 Subject: [PATCH 14/19] Bump version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a1225523..30b45c5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG EA_JOB_ID="433303" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/23,0,11,1/23,0,11,7/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,8/' ${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 @@ -106,7 +106,7 @@ CMD ["php-fpm"] From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="selfhost-22.1.5" +ARG THEME_VERSION="selfhost-22.0.0" # Patches COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab From 6d21ea4e49db553f2843d34513ffa9d8c2f19566 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 17 Nov 2022 18:15:33 +0530 Subject: [PATCH 15/19] Bump version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 30b45c5b..c93a5c64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG EA_JOB_ID="433303" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/23,0,11,1/23,0,11,8/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,9/' ${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 @@ -106,7 +106,7 @@ CMD ["php-fpm"] 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 THEME_VERSION="dev/selfhost-22.0.0" # Patches COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab From e8998ed88cc5eaecb812d15f7476a92ae0766f57 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 17 Nov 2022 18:30:22 +0530 Subject: [PATCH 16/19] Bump version --- Dockerfile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index c93a5c64..83d9cdc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG EA_JOB_ID="433303" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/23,0,11,1/23,0,11,9/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,10/' ${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 @@ -106,7 +106,7 @@ CMD ["php-fpm"] From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="dev/selfhost-22.0.0" +ARG THEME_VERSION="selfhost-22.0.0" # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -138,6 +138,14 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php # 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 +RUN sed -i 's/(0,Pd.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js + +RUN sed -i 's/ in Nextcloud/ /' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js +RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js + +#replace error class in schedule response error file to fix error color +RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-error.php From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" @@ -173,9 +181,6 @@ RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1|| # hide oidc login button RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$context->registerAlternativeLogin(OIDCLoginOption::class);/' ${BASE_DIR}/custom_apps/oidc_login/lib/AppInfo/Application.php -# change notifications icon src -RUN sed -i 's/(0,Pd.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js - # sed version of ldap_write_support RUN cd ${BASE_DIR}/custom_apps/ldap_write_support && sed -i 's/max-version="22"/max-version="23"/' appinfo/info.xml @@ -191,15 +196,9 @@ RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE # 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 -RUN sed -i 's/ in Nextcloud/ /' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js -RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js - # Remove changeAvatar in changeUserHook of ldap_write_support as it throws errors RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_apps/ldap_write_support/lib/LDAPUserManager.php -#replace error class in schedule response error file to fix error color -RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-error.php - # Remove 'fix broken values of calendar objects' repair step RUN sed -i '/OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE_DIR}/apps/dav/appinfo/info.xml -- GitLab From a3eeba1a7a493edbe242354ccaa94e3828fc10b7 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 17 Nov 2022 18:37:58 +0530 Subject: [PATCH 17/19] Bump version one last time --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 83d9cdc6..0ef387db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG EA_JOB_ID="433303" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/23,0,11,1/23,0,11,10/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,11/' ${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 fbade56d158d6af554583dce5b4c8f8b3999f44a Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 17 Nov 2022 18:46:02 +0530 Subject: [PATCH 18/19] Bump version number again --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0ef387db..b2e9afdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG EA_JOB_ID="433303" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/23,0,11,1/23,0,11,11/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,12/' ${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 4e85c538cbb2a201fedf409be07eaf535b368463 Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 28 Nov 2022 16:53:27 +0530 Subject: [PATCH 19/19] Move sed down --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b2e9afdd..2c712071 100644 --- a/Dockerfile +++ b/Dockerfile @@ -134,8 +134,6 @@ 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/ -# Replace "Get your own free account" NC link with /e/ Account link in public pages -RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php # 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 @@ -175,6 +173,9 @@ RUN curl -fsSL -o oidc_login.tar.gz \ tar -xf oidc_login.tar.gz -C ${BASE_DIR}/custom_apps && \ rm oidc_login.tar.gz +# Replace "Get your own free account" NC link with /e/ Account link in public pages +RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php + # show reset pwd page with a query param RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' login.js -- GitLab