From 63dd755062116e6784803a3bc8a40e653dc35c7b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 23 Jan 2023 16:38:21 +0530 Subject: [PATCH 01/16] added dashboard app --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2c712071..56cd8dd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_JOB_ID="433303" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" +ARG ECLOUD_DASHBOARD_JOB_ID="485170" RUN sed -i 's/23,0,11,1/23,0,11,12/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / @@ -93,6 +94,11 @@ RUN curl -fsSL -o ecloud-accounts.zip \ mv dist/ecloud-accounts ${BASE_DIR}/custom_apps/ && \ rm ecloud-accounts.zip; +RUN curl -fsSL -o ecloud_dashboard.zip \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-dashboard/-/jobs/${ECLOUD_DASHBOARD_JOB_ID}/artifacts/download" && \ + unzip ecloud-dashboard.zip && \ + mv dist/ecloud-dashboard ${BASE_DIR}/custom_apps/ && \ + rm ecloud-dashboard.zip; # Remove unzip when unzipping is done RUN apt-get -y remove unzip -- GitLab From ff04261dd3119afae92fe45f6bf05f8669549d0e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 23 Jan 2023 16:51:57 +0530 Subject: [PATCH 02/16] added dashboard app --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 56cd8dd5..6576602c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,7 +94,7 @@ RUN curl -fsSL -o ecloud-accounts.zip \ mv dist/ecloud-accounts ${BASE_DIR}/custom_apps/ && \ rm ecloud-accounts.zip; -RUN curl -fsSL -o ecloud_dashboard.zip \ +RUN curl -fsSL -o ecloud-dashboard.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-dashboard/-/jobs/${ECLOUD_DASHBOARD_JOB_ID}/artifacts/download" && \ unzip ecloud-dashboard.zip && \ mv dist/ecloud-dashboard ${BASE_DIR}/custom_apps/ && \ -- GitLab From 94fd4ee4c5966fb65cc03f0ce3373cf33870db0b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 23 Jan 2023 16:55:11 +0530 Subject: [PATCH 03/16] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6576602c..b26cadc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,12/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,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 9629814a151439d1f0be9945eb16f48638742ac1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 23 Jan 2023 17:38:19 +0530 Subject: [PATCH 04/16] rsync step added --- custom_entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index caaf8d8b..ed38159b 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -32,7 +32,7 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/oidc_login/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ - + rsync $rsync_options --include "/ecloud-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ else echo "Skipping rsync step as version not updated!" -- GitLab From 177aa2a853d4ec020a393f5771557e40236e9b28 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 23 Jan 2023 17:39:25 +0530 Subject: [PATCH 05/16] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b26cadc5..312d9816 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,13/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,14/' ${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 2bbbcbf7011afd2093f9eeb469233b05a6216ade Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 24 Jan 2023 14:44:22 +0530 Subject: [PATCH 06/16] patch moved --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 312d9816..4e1c3df3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -165,7 +165,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PAT 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} @@ -220,4 +220,5 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ # 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 +RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch -- GitLab From 00b9d60f240e5a652825d0e698f84a993ac25ef7 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 24 Jan 2023 14:45:40 +0530 Subject: [PATCH 07/16] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4e1c3df3..af70912e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,14/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,15/' ${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 1030bf19d07b20e91f32a737b482cb50b2ea1ffe Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 24 Jan 2023 14:52:30 +0530 Subject: [PATCH 08/16] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af70912e..fe52d6a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,15/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,16/' ${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 b3e87691c7717aa25675e97e45aaf7806e18c62b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 24 Jan 2023 15:02:16 +0530 Subject: [PATCH 09/16] version bump and removed changes --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index fe52d6a8..f351c25e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,16/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,17/' ${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 @@ -165,7 +165,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PAT 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} @@ -220,5 +220,4 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ # 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 -RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch -- GitLab From 9e6788822a3514c55c66b3dcf0e8418d914c8396 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 24 Jan 2023 15:16:15 +0530 Subject: [PATCH 10/16] version bump and rm changes --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f351c25e..99a47b01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,17/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,18/' ${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 @@ -133,7 +133,8 @@ RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated RUN rm -rf ${TMP_PATCH_DIR} # Custom theme -RUN curl -fsSL -o eCloud-theme.tar.gz \ +RUN rm -rf ${BASE_DIR}/themes/eCloud && \ + 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" && \ tar -xf eCloud-theme.tar.gz -C /tmp/ && \ mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ -- GitLab From d7d3d6296980cf922909f76bcdfb211dbc2262fe Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 24 Jan 2023 15:42:08 +0530 Subject: [PATCH 11/16] version bump --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99a47b01..429f509c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -133,8 +133,7 @@ RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated RUN rm -rf ${TMP_PATCH_DIR} # Custom theme -RUN rm -rf ${BASE_DIR}/themes/eCloud && \ - curl -fsSL -o eCloud-theme.tar.gz \ +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" && \ tar -xf eCloud-theme.tar.gz -C /tmp/ && \ mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ -- GitLab From 29c88d46fbdf5a33c8e17a79c8ccfbe62db4752e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 24 Jan 2023 15:51:17 +0530 Subject: [PATCH 12/16] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 429f509c..6d1c222d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,18/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,19/' ${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 dab17976be7960f20a44e1456719456c50347ec3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 24 Jan 2023 19:57:19 +0530 Subject: [PATCH 13/16] ecloud dashboard enable added --- custom_entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index ed38159b..674c4a26 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -34,6 +34,7 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/oidc_login/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/ecloud-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ + su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-dashboard" else echo "Skipping rsync step as version not updated!" fi -- GitLab From cca3521c9670c2d9b9afdef307a1839ca4c0c2d5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 24 Jan 2023 20:12:19 +0530 Subject: [PATCH 14/16] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6d1c222d..ed103105 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,19/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,20/' ${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 13b7440710cd28f43f723d28eaf4c6ff020b5788 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 25 Jan 2023 10:06:15 +0530 Subject: [PATCH 15/16] command moved and version bump --- Dockerfile | 2 +- custom_entrypoint.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed103105..4b5d3cf2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,20/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,21/' ${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 diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 674c4a26..18f03513 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -34,15 +34,16 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/oidc_login/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/ecloud-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ - su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-dashboard" 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 config:system:set profile.enabled --value=false --type=boolean" + su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-dashboard" else sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean" + su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-dashboard" fi /entrypoint.sh "$@" -- GitLab From 8c98ca239b87320f367ea1aa31c81baf13e9d8ec Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 25 Jan 2023 16:31:15 +0530 Subject: [PATCH 16/16] command moved and version bump --- Dockerfile | 2 +- custom_entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b5d3cf2..d560088b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,21/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,22/' ${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 diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 18f03513..718b6fc9 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -43,7 +43,7 @@ if [ "$(id -u)" = 0 ]; then su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-dashboard" else sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean" - su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-dashboard" + sh -c "php $DST_DIR/occ app:enable ecloud-dashboard" fi /entrypoint.sh "$@" -- GitLab