From 39a16356a5c943ceeb25d801ee4a7c14f5f6fce8 Mon Sep 17 00:00:00 2001 From: akhil Date: Wed, 1 Dec 2021 13:40:55 +0530 Subject: [PATCH 01/10] Calendar 3 and news 17 --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 11bc0466..708ead35 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,11 +4,11 @@ ARG TMP_PATCH_DIR="/tmp/build_patches" # temporarily setting theme version to "nc21" to test ARG THEME_VERSION="21.0.0" ARG THEME_HELPER_VERSION="1.0.2" -ARG NEWS_VERSION="16.2.1" +ARG NEWS_VERSION="17.0.0" ARG QUOTA_WARN_VERSION="1.11.0" ARG NOTES_VERSION="4.2.0" ARG CONTACTS_VERSION="4.0.6" -ARG CALENDAR_VERSION="2.3.4" +ARG CALENDAR_VERSION="3.0.0" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="7.1.2" @@ -18,7 +18,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" COPY patches/ ${TMP_PATCH_DIR}/ -RUN sed -i 's/21,0,7,0/21,0,7,8/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,7,0/21,0,7,9/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip @@ -116,9 +116,9 @@ RUN rm -rf ${TMP_PATCH_DIR} RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/emit("new-contact")/emit("newContact")/g' js/contacts-main.js -RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar.js -RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[a,"displayname"\]},//' js/calendar.js -RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/defaultValue:"PUBLIC"/defaultValue:"CONFIDENTIAL"/' js/calendar.js +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 +RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/defaultValue:"PUBLIC"/defaultValue:"CONFIDENTIAL"/' 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 -- GitLab From c5570401c9fc71cedbb19862922e0b4c2d995a28 Mon Sep 17 00:00:00 2001 From: akhil Date: Wed, 1 Dec 2021 13:44:11 +0530 Subject: [PATCH 02/10] Temporarily use hotfixes-21 branch of ecloud theme to build image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 708ead35..bb138163 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM nextcloud:21.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" # temporarily setting theme version to "nc21" to test -ARG THEME_VERSION="21.0.0" +ARG THEME_VERSION="hotfixes-21" ARG THEME_HELPER_VERSION="1.0.2" ARG NEWS_VERSION="17.0.0" ARG QUOTA_WARN_VERSION="1.11.0" -- GitLab From d7ba6fe252763a717e397ac7c1715af2b0ab1cf2 Mon Sep 17 00:00:00 2001 From: akhil Date: Wed, 1 Dec 2021 14:32:22 +0530 Subject: [PATCH 03/10] Temporarily set rainloop version to 1.16.0 branch --- Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb138163..8bc8eb89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG CONTACTS_VERSION="4.0.6" ARG CALENDAR_VERSION="3.0.0" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" -ARG RAINLOOP_VERSION="7.1.2" +ARG RAINLOOP_VERSION="rainloop-1.16.0" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-21" ARG ECLOUD_LAUNCHER_JOB_ID="222001" @@ -60,10 +60,16 @@ RUN curl -fsSL -o email-recovery.zip \ cd dist && tar -xf email-recovery.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm email-recovery.tar.gz; +#RUN curl -fsSL -o rainloop.tar.gz \ +# "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}.tar.gz" && \ +# tar -xf rainloop.tar.gz -C ${BASE_DIR}/custom_apps/ && \ +# 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 rainloop.tar.gz \ - "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}.tar.gz" && \ + "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}/rainloop-nextcloud-${RAINLOOP_VERSION}.tar.gz" && \ tar -xf rainloop.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - mv "${BASE_DIR}/custom_apps/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}" "${BASE_DIR}/custom_apps/rainloop" && \ + mv "${BASE_DIR}/custom_apps/rainloop-nextcloud-${RAINLOOP_VERSION}" "${BASE_DIR}/custom_apps/rainloop" && \ rm rainloop.tar.gz; RUN curl -fsSL -o ecloud_drop_account.tar.gz \ -- GitLab From f071eddc9b98346c283febf7cbdf8c84c8bb7f96 Mon Sep 17 00:00:00 2001 From: akhil Date: Wed, 1 Dec 2021 20:22:14 +0530 Subject: [PATCH 04/10] Updated rainloop version to 1.16.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8bc8eb89..fbc3bca0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG CONTACTS_VERSION="4.0.6" ARG CALENDAR_VERSION="3.0.0" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" -ARG RAINLOOP_VERSION="rainloop-1.16.0" +ARG RAINLOOP_VERSION="1.16.0" ARG RAINLOOP_COMMIT_SHA="aa5c57a7" ARG EDA_TAG="nc-21" ARG ECLOUD_LAUNCHER_JOB_ID="222001" -- GitLab From a3bf657355caa21f62b076157cf61fec6e8130af Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 2 Dec 2021 15:50:57 +0530 Subject: [PATCH 05/10] calendar v3.0.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fbc3bca0..e3c2cfbd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG NEWS_VERSION="17.0.0" ARG QUOTA_WARN_VERSION="1.11.0" ARG NOTES_VERSION="4.2.0" ARG CONTACTS_VERSION="4.0.6" -ARG CALENDAR_VERSION="3.0.0" +ARG CALENDAR_VERSION="3.0.1" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="1.16.0" -- GitLab From 7e1b50000e85b11c66b5325ef1cd5ddb1ba6b384 Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 2 Dec 2021 16:35:14 +0530 Subject: [PATCH 06/10] Bump version number --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e3c2cfbd..548ff96b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" COPY patches/ ${TMP_PATCH_DIR}/ -RUN sed -i 's/21,0,7,0/21,0,7,9/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,7,0/21,0,7,10/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 7524e173da858ba8adf695f4c9d846ce088b5ccd Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 3 Dec 2021 14:58:19 +0530 Subject: [PATCH 07/10] Updated help link to nc20 --- 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 6d5032f7..baae85b8 100644 --- a/patches/009-help-links.patch +++ b/patches/009-help-links.patch @@ -40,7 +40,7 @@ help links are shown - t('Administrator documentation')); ?> +
  • + ++ href="https://docs.nextcloud.com/server/21/user_manual/en/" target="_blank" rel="noreferrer noopener"> + t('User documentation')); ?> ↗
    • -- GitLab From d80688ec86dafea344759a8cf50941d59943a053 Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 3 Dec 2021 16:24:26 +0530 Subject: [PATCH 08/10] Added rainloop commit sha --- Dockerfile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 548ff96b..f450ed4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,13 +12,13 @@ ARG CALENDAR_VERSION="3.0.1" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="1.16.0" -ARG RAINLOOP_COMMIT_SHA="aa5c57a7" +ARG RAINLOOP_COMMIT_SHA="e9da581c" ARG EDA_TAG="nc-21" ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" COPY patches/ ${TMP_PATCH_DIR}/ -RUN sed -i 's/21,0,7,0/21,0,7,10/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,7,0/21,0,7,11/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip @@ -60,16 +60,10 @@ RUN curl -fsSL -o email-recovery.zip \ cd dist && tar -xf email-recovery.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm email-recovery.tar.gz; -#RUN curl -fsSL -o rainloop.tar.gz \ -# "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}.tar.gz" && \ -# tar -xf rainloop.tar.gz -C ${BASE_DIR}/custom_apps/ && \ -# 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 rainloop.tar.gz \ - "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}/rainloop-nextcloud-${RAINLOOP_VERSION}.tar.gz" && \ + "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}.tar.gz" && \ tar -xf rainloop.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - mv "${BASE_DIR}/custom_apps/rainloop-nextcloud-${RAINLOOP_VERSION}" "${BASE_DIR}/custom_apps/rainloop" && \ + 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_drop_account.tar.gz \ -- GitLab From dedee45308591dc64c5ca7233375d1c6dc7b5b93 Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 3 Dec 2021 16:39:37 +0530 Subject: [PATCH 09/10] Set correct rainloop version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f450ed4b..4a4f6d22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG CONTACTS_VERSION="4.0.6" ARG CALENDAR_VERSION="3.0.1" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" -ARG RAINLOOP_VERSION="1.16.0" +ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="e9da581c" ARG EDA_TAG="nc-21" ARG ECLOUD_LAUNCHER_JOB_ID="222001" -- GitLab From b6028b4afa5418bb385cb8f6a71cbfcc93766b44 Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 3 Dec 2021 17:56:49 +0530 Subject: [PATCH 10/10] Use 21.1.0 version of theme --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4a4f6d22..4c70e8a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,7 @@ FROM nextcloud:21.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -# temporarily setting theme version to "nc21" to test -ARG THEME_VERSION="hotfixes-21" +ARG THEME_VERSION="21.1.0" ARG THEME_HELPER_VERSION="1.0.2" ARG NEWS_VERSION="17.0.0" ARG QUOTA_WARN_VERSION="1.11.0" -- GitLab