From 43283b50b0fb78502fdc0fd51cd622713ee18d31 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Jul 2023 20:26:42 +0530 Subject: [PATCH 1/6] fix error --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6327f22e..717fd896 100644 --- a/Dockerfile +++ b/Dockerfile @@ -160,7 +160,7 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ rm user_backend_sql_raw.tar.gz; # Selfhost theme -RUN if [ "${IS_SELFHOST}" === "true" ] ; then \ +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/ && \ -- GitLab From a07c4c5d79d36feae3b5ebc8e02a79e6ee1d61f1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Jul 2023 20:44:49 +0530 Subject: [PATCH 2/6] fix error --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 717fd896..6734e30e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -124,7 +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 +ARG IS_SELFHOST="true" # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -194,7 +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 +ARG IS_SELFHOST="false" # Patches COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab From f27f2213c6fc1a3b130d1f67a2b5290a8ce6ca29 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Jul 2023 20:52:01 +0530 Subject: [PATCH 3/6] fix error --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6734e30e..850a9b4b 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,16/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,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 -- GitLab From 00ac2d37a934f0577891c23d31797710da3775fe Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Jul 2023 21:36:54 +0530 Subject: [PATCH 4/6] fix error --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 850a9b4b..5607951c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -160,7 +160,7 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ rm user_backend_sql_raw.tar.gz; # Selfhost theme -RUN if [ "${IS_SELFHOST}" = "true" ]; then \ +RUN if $IS_SELFHOST; 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/ && \ -- GitLab From ab01fe80fe4698ce1848ad986b85b5d8a1179c6f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Jul 2023 22:24:19 +0530 Subject: [PATCH 5/6] fix error --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5607951c..d3bbf2cc 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,17/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,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 @@ -124,7 +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" +ARG IS_SELFHOST=true # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -160,7 +160,7 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ rm user_backend_sql_raw.tar.gz; # Selfhost theme -RUN if $IS_SELFHOST; then \ +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/ && \ @@ -194,7 +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" +ARG IS_SELFHOST=false # Patches COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab From 11ef28e35130775a2586b87b76f82230d3667c4e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Jul 2023 10:27:24 +0530 Subject: [PATCH 6/6] remove selfhost theme helper from ecloud --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d3bbf2cc..6e9f7931 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,18/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,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 @@ -266,6 +266,11 @@ RUN rm -rf ${BASE_DIR}/themes/eCloud && \ chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ +# Remove Selfhost theme +RUN if [ "$IS_SELFHOST" = false ]; then \ + rm -rf ${BASE_DIR}/custom_apps/selfhost-theme-helper;\ + fi + # 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 -- GitLab