From cbcfde86cf95533157b1040da1094c8a902526d4 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 10 Jun 2022 15:35:07 +0530 Subject: [PATCH 1/8] new calendar-contact and loginfix --- Dockerfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4406054..7e200eb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ 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.0" +ARG THEME_VERSION="22.1.1" ARG THEME_HELPER_VERSION="1.3.1" ARG NEWS_VERSION="18.0.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.3.1" -ARG CONTACTS_VERSION="4.1.1" -ARG CALENDAR_JOB_ID="321100" +ARG CONTACTS_JOB_ID="321066" +ARG CALENDAR_JOB_ID="322795" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="313915" ARG RAINLOOP_VERSION="7.2.5" @@ -40,10 +40,12 @@ RUN curl -fsSL -o notes.tar.gz \ tar -xf notes.tar.gz -C ${BASE_DIR}/custom_apps/ && \ 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" && \ - tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - rm contacts.tar.gz; +# custom Contact +RUN curl -fsSL -o contacts.zip \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/contacts/-/jobs/${CONTACTS_JOB_ID}/artifacts/download" && \ + unzip calendar.zip && \ + mv dist/contacts ${BASE_DIR}/custom_apps/ && \ + rm contacts.zip; # custom Calendar 3.2.4 RUN curl -fsSL -o calendar.zip \ -- GitLab From 9bd42a21e5260b4237624ec32f03baf16fa656dc Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 10 Jun 2022 15:38:21 +0530 Subject: [PATCH 2/8] new calendar-contact and loginfix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7e200eb5..656f592c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,7 +43,7 @@ RUN curl -fsSL -o notes.tar.gz \ # custom Contact RUN curl -fsSL -o contacts.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/contacts/-/jobs/${CONTACTS_JOB_ID}/artifacts/download" && \ - unzip calendar.zip && \ + unzip contacts.zip && \ mv dist/contacts ${BASE_DIR}/custom_apps/ && \ rm contacts.zip; -- GitLab From fed8640493d9a66b3e9a406059aeb5934a71e071 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 10 Jun 2022 20:03:49 +0530 Subject: [PATCH 3/8] new calendar-contact and loginfix --- patches/016-login-screen.patch | 35 +++++++++++----------------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch index 52b5bb9f..71e78f49 100644 --- a/patches/016-login-screen.patch +++ b/patches/016-login-screen.patch @@ -1,33 +1,20 @@ ---- /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php 2022-05-25 13:04:50.156968531 +0530 -+++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php 2022-05-25 13:12:08.473125206 +0530 -@@ -22,14 +22,50 @@ +--- /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php 2022-06-09 13:47:41.255340395 +0530 ++++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php 2022-06-09 13:37:22.563505705 +0530 +@@ -20,6 +20,7 @@ + + ++ -+ -+ - - - + +@@ -28,8 +29,29 @@ $initialState) { ?> -
-
-+
" > ++
" > + + +
@@ -53,7 +40,7 @@
-- GitLab From 54130f5d91ec42af19c4c7b5f409458e0c06f9e5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 10 Jun 2022 21:08:07 +0530 Subject: [PATCH 4/8] new calendar-contact and loginfix --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 656f592c..625f0b2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ ARG THEME_HELPER_VERSION="1.3.1" ARG NEWS_VERSION="18.0.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.3.1" -ARG CONTACTS_JOB_ID="321066" -ARG CALENDAR_JOB_ID="322795" +ARG CONTACTS_JOB_ID="323110" +ARG CALENDAR_JOB_ID="322406" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="313915" ARG RAINLOOP_VERSION="7.2.5" -- GitLab From ee0311c8da2142da0c8b82f77a01daa7c277a050 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 13 Jun 2022 13:14:40 +0530 Subject: [PATCH 5/8] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 625f0b2e..a3a820fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="318040" 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,12/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,8,1/22,2,8,13/' ${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 83ca2aae499f898bfadc81c4ab775e61f19e45a5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 13 Jun 2022 16:15:15 +0530 Subject: [PATCH 6/8] conflict resolve --- patches/016-login-screen.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch index 71e78f49..6af76804 100644 --- a/patches/016-login-screen.patch +++ b/patches/016-login-screen.patch @@ -1,5 +1,5 @@ ---- /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php 2022-06-09 13:47:41.255340395 +0530 -+++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php 2022-06-09 13:37:22.563505705 +0530 +--- ./core/templates/layout.guest-new.php 2022-06-09 13:47:41.255340395 +0530 ++++ ./core/templates/layout.guest.php 2022-06-09 13:37:22.563505705 +0530 @@ -20,6 +20,7 @@ -- GitLab From 898a924fa02df517dca1e504d5d9c4d86bb758c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= Date: Tue, 14 Jun 2022 10:30:14 +0000 Subject: [PATCH 7/8] Calendar with fixes --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a3a820fe..1bb5a226 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG NEWS_VERSION="18.0.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.3.1" ARG CONTACTS_JOB_ID="323110" -ARG CALENDAR_JOB_ID="322406" +ARG CALENDAR_JOB_ID="324817" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="313915" ARG RAINLOOP_VERSION="7.2.5" -- GitLab From f35d5c6756239eebdb7b3dfa646feb0f0ffb3ee7 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 14 Jun 2022 16:23:47 +0530 Subject: [PATCH 8/8] conflict resolved --- custom_entrypoint.sh | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 97f7495e..87606ea4 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -37,22 +37,5 @@ else echo "Skipping rsync step as version not updated!" fi -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 murena_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: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: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 /entrypoint.sh "$@" -- GitLab