From 3ad5e1c619812393b166082ae621b87ffc29e605 Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 27 Dec 2021 17:29:34 +0530 Subject: [PATCH 01/13] Added ecloud-accounts to replace ecloud_drop_account --- Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa5aa3a3..092d4a0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,12 +12,12 @@ ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="e9da581c" -ARG EDA_TAG="nc-21" +ARG EA_TAG="1.0.0" 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,12/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,7,0/21,0,7,13/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip @@ -65,11 +65,6 @@ 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_drop_account.tar.gz \ - "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/ecloud-drop-account/-/archive/${EDA_TAG}/ecloud-drop-account-${EDA_TAG}.tar.gz" && \ - tar -xf ecloud_drop_account.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - 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" && \ @@ -89,6 +84,12 @@ 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/selfhost/nextcloud-apps/ecloud-drop-account/-/archive/${EA_TAG}/ecloud-drop-account-${EA_TAG}.tar.gz" && \ + tar -xf ecloud-accounts.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + mv "${BASE_DIR}/custom_apps/ecloud-drop-account-${EA_TAG}" "${BASE_DIR}/custom_apps/ecloud-accounts" && \ + rm ecloud-accounts.tar.gz; + # Remove unzip when unzipping is done RUN apt-get -y remove unzip -- GitLab From 1b2a978f28915c90b47b39e47b9b41a773295f76 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 28 Dec 2021 12:08:49 +0530 Subject: [PATCH 02/13] updated contacts and calendar versions --- Dockerfile | 4 ++-- custom_entrypoint.sh | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 092d4a0a..06ebe787 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ ARG THEME_HELPER_VERSION="1.0.2" ARG NEWS_VERSION="17.0.1" ARG QUOTA_WARN_VERSION="1.13.0" ARG NOTES_VERSION="4.2.0" -ARG CONTACTS_VERSION="4.0.6" -ARG CALENDAR_VERSION="3.0.1" +ARG CONTACTS_VERSION="4.0.7" +ARG CALENDAR_VERSION="3.0.3" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="7.1.2" diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 65ebb0f0..217a98b3 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -40,12 +40,16 @@ 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 app:enable ecloud-accounts" + su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable ecloud_drop_account" 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 app:enable ecloud-theme-helper" + sh -c "php $DST_DIR/occ app:enable ecloud-accounts" + sh -c "php $DST_DIR/occ app:disable ecloud_drop_account" 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 -- GitLab From 88b05ca963fd73c1f5ccb5c1dead1afb004c61dd Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 28 Dec 2021 12:09:04 +0530 Subject: [PATCH 03/13] Bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 06ebe787..a78b1caa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,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,13/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,7,0/21,0,7,14/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 64525b189dd49b977028e3af2342ddc88667338b Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 28 Dec 2021 12:58:04 +0530 Subject: [PATCH 04/13] Fixed contacts and calendar links --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a78b1caa..af011c33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,12 +39,12 @@ RUN curl -fsSL -o notes.tar.gz \ rm notes.tar.gz; RUN curl -fsSL -o contacts.tar.gz \ - "https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts.tar.gz" && \ + "https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts-v${CONTACTS_VERSION}.tar.gz" && \ tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm contacts.tar.gz; RUN curl -fsSL -o calendar.tar.gz \ - "https://github.com/nextcloud-releases/calendar/releases/download/v${CALENDAR_VERSION}/calendar.tar.gz" && \ + "https://github.com/nextcloud-releases/calendar/releases/download/v${CALENDAR_VERSION}/calendar-v${CALENDAR_VERSION}.tar.gz" && \ tar -xf calendar.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm calendar.tar.gz; -- GitLab From accfcb33beea188acbb2f1110f8edea34d8786db Mon Sep 17 00:00:00 2001 From: akhil Date: Wed, 29 Dec 2021 14:07:33 +0530 Subject: [PATCH 05/13] Calendar 3.0.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af011c33..e1c1ae94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG NEWS_VERSION="17.0.1" ARG QUOTA_WARN_VERSION="1.13.0" ARG NOTES_VERSION="4.2.0" ARG CONTACTS_VERSION="4.0.7" -ARG CALENDAR_VERSION="3.0.3" +ARG CALENDAR_VERSION="3.0.4" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="7.1.2" -- GitLab From c27123e9b819ed1a112c5e3ffb426bcee10a99e4 Mon Sep 17 00:00:00 2001 From: akhil Date: Wed, 29 Dec 2021 16:31:45 +0530 Subject: [PATCH 06/13] Bump version number --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e1c1ae94..43ecad9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,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,14/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,7,0/21,0,7,15/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 7a2b0e8aaa9e282a3abe55eb03db34f4adf5f28a Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 3 Jan 2022 13:19:53 +0530 Subject: [PATCH 07/13] Temporarily use user-exists-route tag for ecloud-accounts --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 43ecad9d..1186dcf2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,12 +12,12 @@ ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="e9da581c" -ARG EA_TAG="1.0.0" +ARG EA_TAG="user-exists-route" 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,15/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,7,0/21,0,7,16/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 251212b937311dbc82fd756113bc41ec1366c374 Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 3 Jan 2022 16:45:28 +0530 Subject: [PATCH 08/13] Updated theme to css-fixes temporarily --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1186dcf2..befb17cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:21.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="21.1.0" +ARG THEME_VERSION="css-fixes" ARG THEME_HELPER_VERSION="1.0.2" ARG NEWS_VERSION="17.0.1" ARG QUOTA_WARN_VERSION="1.13.0" -- GitLab From 9e36bcdab2762b0ec5d305d58206a333e54ea403 Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 3 Jan 2022 19:21:18 +0530 Subject: [PATCH 09/13] Update EA TAG and bump version number --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index befb17cf..b9940fa5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,12 +12,12 @@ ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="e9da581c" -ARG EA_TAG="user-exists-route" +ARG EA_TAG="1.0.0" 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,16/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,7,0/21,0,7,17/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From aed4661423d11b05a3af1f47687432559a144b43 Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 3 Jan 2022 20:21:48 +0530 Subject: [PATCH 10/13] Theme version set to 21.1.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b9940fa5..cedac30f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:21.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="css-fixes" +ARG THEME_VERSION="21.1.1" ARG THEME_HELPER_VERSION="1.0.2" ARG NEWS_VERSION="17.0.1" ARG QUOTA_WARN_VERSION="1.13.0" -- GitLab From e99de3e041de10ddcb5cb6c9e67f9ced3aeef2dd Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 4 Jan 2022 16:13:16 +0530 Subject: [PATCH 11/13] calendar 4.0.6 and contacts 3.0.1 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cedac30f..fc5c3231 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ ARG THEME_HELPER_VERSION="1.0.2" ARG NEWS_VERSION="17.0.1" ARG QUOTA_WARN_VERSION="1.13.0" ARG NOTES_VERSION="4.2.0" -ARG CONTACTS_VERSION="4.0.7" -ARG CALENDAR_VERSION="3.0.4" +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="7.1.2" -- GitLab From 2de02e1bed93d3e5088eb294d36af2dbc62d62c2 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 4 Jan 2022 16:15:01 +0530 Subject: [PATCH 12/13] Bump version number --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fc5c3231..8f89d3d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,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,17/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,7,0/21,0,7,18/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 8885cce70c141c30b663a6cdad50a319f04d9e8b Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 4 Jan 2022 16:27:14 +0530 Subject: [PATCH 13/13] Update contacts and calendar urls --- Dockerfile | 4 ++-- custom_entrypoint.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f89d3d0..9d8482d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,12 +39,12 @@ RUN curl -fsSL -o notes.tar.gz \ rm notes.tar.gz; RUN curl -fsSL -o contacts.tar.gz \ - "https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts-v${CONTACTS_VERSION}.tar.gz" && \ + "https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts.tar.gz" && \ tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm contacts.tar.gz; RUN curl -fsSL -o calendar.tar.gz \ - "https://github.com/nextcloud-releases/calendar/releases/download/v${CALENDAR_VERSION}/calendar-v${CALENDAR_VERSION}.tar.gz" && \ + "https://github.com/nextcloud-releases/calendar/releases/download/v${CALENDAR_VERSION}/calendar.tar.gz" && \ tar -xf calendar.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm calendar.tar.gz; diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 217a98b3..942532c0 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -40,16 +40,16 @@ 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 app:enable ecloud-accounts" su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable ecloud_drop_account" + su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-accounts" 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:enable ecloud-theme-helper" - sh -c "php $DST_DIR/occ app:enable ecloud-accounts" sh -c "php $DST_DIR/occ app:disable ecloud_drop_account" + sh -c "php $DST_DIR/occ app:enable ecloud-accounts" 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 -- GitLab