From 107e0bba609b2fb8e2c30854ad2a42f266b046c4 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 6 Jul 2023 12:48:06 +0530 Subject: [PATCH 01/18] selfhost -25.0.8 --- Dockerfile | 6 +++--- custom_entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9504c754..f433bcd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,12 +10,12 @@ ARG EA_JOB_ID="625302" ARG LAUNCHER_JOB_ID="616075" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG DASHBOARD_JOB_ID="616067" -ARG SNAPPY_VERSION="2.27.2" +ARG SNAPPY_VERSION="2.28.1" ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,2/25,0,8,9/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,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 @@ -121,7 +121,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-24.0.10" +ARG THEME_VERSION="25.0.12" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" # Patches diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 7c7d3f46..77b0d20c 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -29,7 +29,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 "/murena-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ -- GitLab From 25976b266d5ea814e7e7f94160b91d78e494a13d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 11:00:53 +0530 Subject: [PATCH 02/18] login page fix --- Dockerfile | 10 +++++++++- custom_entrypoint.sh | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f433bcd4..35f14dde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,2/25,0,8,10/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,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 @@ -123,6 +123,7 @@ ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="25.0.12" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" +ARG SELFHOST_THEME_VERSION="1.0.0" # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -157,6 +158,13 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm user_backend_sql_raw.tar.gz; +# Selfhost theme +RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ + tar -xf selfhost-theme-helper.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + rm selfhost-theme-helper.tar.gz; + + # 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 diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 77b0d20c..a42e4d01 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 "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ rsync $rsync_options --include "/memories/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ + rsync $rsync_options --include "/selfhost-theme-helper/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ else echo "Skipping rsync step as version not updated!" fi -- GitLab From c51a280b70c4073e860026c0420038a7748c4241 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 11:04:26 +0530 Subject: [PATCH 03/18] login page fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35f14dde..ef51a299 100644 --- a/Dockerfile +++ b/Dockerfile @@ -159,7 +159,7 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ rm user_backend_sql_raw.tar.gz; # Selfhost theme -RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ +RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ tar -xf selfhost-theme-helper.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm selfhost-theme-helper.tar.gz; -- GitLab From 9ffab29878dde616043d7d60a306276cd71febc2 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 11:29:10 +0530 Subject: [PATCH 04/18] login page fix --- Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ef51a299..70e919dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -158,12 +158,14 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm user_backend_sql_raw.tar.gz; -# Selfhost theme +# Selfhost theme helper RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf selfhost-theme-helper.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - rm selfhost-theme-helper.tar.gz; - + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ + tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ + mkdir -p ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ + mv /tmp/selfhost-theme-helper-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ + chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ + rm -rf selfhost-theme-helper.tar.gz # 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 -- GitLab From 81207919fa53f142992b3917fc2c87209c6c0282 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 11:32:20 +0530 Subject: [PATCH 05/18] login page fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 70e919dc..53bda113 100644 --- a/Dockerfile +++ b/Dockerfile @@ -161,7 +161,7 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ # Selfhost theme helper RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ + tar -xf selfhost-theme-helper-${SNAPPY_THEME_VERSION}.tar.gz -C /tmp/ && \ mkdir -p ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ mv /tmp/selfhost-theme-helper-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ -- GitLab From 742a6eb7bc6e73112b9d47fff4d9ea8f303205b8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 11:35:34 +0530 Subject: [PATCH 06/18] login page fix --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53bda113..640eb33e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -160,10 +160,10 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ # Selfhost theme helper RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf selfhost-theme-helper-${SNAPPY_THEME_VERSION}.tar.gz -C /tmp/ && \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/1.0.0/selfhost-theme-helper-1.0.0.tar.gz" && \ + tar -xf selfhost-theme-helper-1.0.0.tar.gz -C /tmp/ && \ mkdir -p ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ - mv /tmp/selfhost-theme-helper-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ + mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ rm -rf selfhost-theme-helper.tar.gz -- GitLab From 602b05cde2780d8bea26fa3908056ce5b9d78eea Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 11:47:56 +0530 Subject: [PATCH 07/18] login page fix --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 640eb33e..5bc54112 100644 --- a/Dockerfile +++ b/Dockerfile @@ -158,14 +158,14 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm user_backend_sql_raw.tar.gz; -# Selfhost theme helper +# Selfhost theme RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/1.0.0/selfhost-theme-helper-1.0.0.tar.gz" && \ - tar -xf selfhost-theme-helper-1.0.0.tar.gz -C /tmp/ && \ - mkdir -p ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ - mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ - chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ - rm -rf selfhost-theme-helper.tar.gz + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ + tar -xf selfhost-theme-helper.gz -C /tmp/ && \ + mv /tmp/selfhost-theme-helper-${SELFHOST_THEME_VERSION}/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ + chown -R www-data:www-data ${BASE_DIR}/themes/selfhost-theme-helper/ && \ + rm -rf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz + # 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 -- GitLab From ba7a19e9cabb38174a7b455d4ddbc95b8e9e7b56 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 12:28:31 +0530 Subject: [PATCH 08/18] login page fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5bc54112..51130d49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -161,7 +161,7 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ # Selfhost theme RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf selfhost-theme-helper.gz -C /tmp/ && \ + tar -xf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.gz -C /tmp/ && \ mv /tmp/selfhost-theme-helper-${SELFHOST_THEME_VERSION}/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ chown -R www-data:www-data ${BASE_DIR}/themes/selfhost-theme-helper/ && \ rm -rf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz -- GitLab From 981c4d5432f91aa791ceac903527a64e0653185b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 12:31:33 +0530 Subject: [PATCH 09/18] login page fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 51130d49..282a7526 100644 --- a/Dockerfile +++ b/Dockerfile @@ -161,7 +161,7 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ # Selfhost theme RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.gz -C /tmp/ && \ + tar -xf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz -C /tmp/ && \ mv /tmp/selfhost-theme-helper-${SELFHOST_THEME_VERSION}/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ chown -R www-data:www-data ${BASE_DIR}/themes/selfhost-theme-helper/ && \ rm -rf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz -- GitLab From 46198eb2873e9d397c27ab1600f1053d5cd9c00d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 12:34:20 +0530 Subject: [PATCH 10/18] login page fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 282a7526..1773d72c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -161,7 +161,7 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ # Selfhost theme RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz -C /tmp/ && \ + tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ mv /tmp/selfhost-theme-helper-${SELFHOST_THEME_VERSION}/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ chown -R www-data:www-data ${BASE_DIR}/themes/selfhost-theme-helper/ && \ rm -rf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz -- GitLab From 54b47c0f15af91067b312acd15aed61a1794515d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 12:37:04 +0530 Subject: [PATCH 11/18] login page fix --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1773d72c..38670864 100644 --- a/Dockerfile +++ b/Dockerfile @@ -161,10 +161,11 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ # Selfhost theme RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ - mv /tmp/selfhost-theme-helper-${SELFHOST_THEME_VERSION}/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ - chown -R www-data:www-data ${BASE_DIR}/themes/selfhost-theme-helper/ && \ - rm -rf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz + tar -xf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz -C /tmp/ && \ + mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ + chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ + rm -f selfhost-theme-helper.tar.gz + # Set default class of hidden to settings-hint -- GitLab From 772b7f2cd4d081d50e401379e6d926a7eee7768d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 12:39:19 +0530 Subject: [PATCH 12/18] login page fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 38670864..b77fef43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -161,7 +161,7 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ # Selfhost theme RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz -C /tmp/ && \ + tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ rm -f selfhost-theme-helper.tar.gz -- GitLab From 69d078f2a126d2ca3527910cf2b793833551791c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 12:41:25 +0530 Subject: [PATCH 13/18] login page fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b77fef43..eba77b46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,2/25,0,8,11/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,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 c9ee2b8ade0e6c1950dd0a3b2f08b2e178bc9ff9 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Jul 2023 23:51:03 +0530 Subject: [PATCH 14/18] login page fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eba77b46..8f362afb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,2/25,0,8,12/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,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 9081ee5ba6fe46202fce703c144898ca5f713432 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 17 Jul 2023 18:39:21 +0530 Subject: [PATCH 15/18] ea job id update --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f362afb..9a69b1ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="620997" ARG CALENDAR_JOB_ID="628427" ARG EMAIL_RECOVERY_JOB_ID="582038" -ARG EA_JOB_ID="625302" +ARG EA_JOB_ID="643340" ARG LAUNCHER_JOB_ID="616075" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG DASHBOARD_JOB_ID="616067" @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,2/25,0,8,13/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,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 6363a0399033ed7a485f01d79d390022a58782fc Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 18 Jul 2023 15:49:47 +0530 Subject: [PATCH 16/18] ea job id update --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9a69b1ba..eaf6c684 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG NOTES_VERSION="4.8.0" ARG CONTACTS_JOB_ID="620997" ARG CALENDAR_JOB_ID="628427" ARG EMAIL_RECOVERY_JOB_ID="582038" -ARG EA_JOB_ID="643340" +ARG EA_JOB_ID="644363" ARG LAUNCHER_JOB_ID="616075" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG DASHBOARD_JOB_ID="616067" @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,2/25,0,8,14/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,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 749360bb07c42fe5120182464e79fdb9e0a5b4ab Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 24 Jul 2023 19:24:30 +0530 Subject: [PATCH 17/18] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 56100565..8a1272d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.7" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,2/25,0,8,15/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,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 8c9d0d7dea757aca6fa8d7b59654a4ef343af117 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Jul 2023 16:09:27 +0530 Subject: [PATCH 18/18] conditonal selfhost theme helper --- Dockerfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8a1272d7..6327f22e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -124,6 +124,7 @@ ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="25.0.12" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG SELFHOST_THEME_VERSION="1.0.0" +ARG IS_SELFHOST=true # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -159,12 +160,14 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ rm user_backend_sql_raw.tar.gz; # Selfhost theme -RUN curl -fsSL -o selfhost-theme-helper.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ - tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ - mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ - chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ - rm -f selfhost-theme-helper.tar.gz +RUN if [ "${IS_SELFHOST}" === "true" ] ; then \ + curl -fsSL -o selfhost-theme-helper.tar.gz \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \ + tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \ + mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \ + chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \ + rm -f selfhost-theme-helper.tar.gz;\ + fi @@ -191,6 +194,7 @@ ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="25.0.12" ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0" ARG OIDC_LOGIN_VERSION="2.6.0" +ARG IS_SELFHOST=false # Patches COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab