From 47bef63bd855f319c80553a5b0a6ac29b3553501 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Mar 2023 13:26:24 +0530 Subject: [PATCH 01/11] snappy-theme added --- Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Dockerfile b/Dockerfile index 418dbe92..176ba5ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -147,6 +147,7 @@ ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="24.0.3" ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0" ARG OIDC_LOGIN_VERSION="2.4.0" +ARG SNAPPY_THEME_VERSION="1.2.2" # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -209,3 +210,11 @@ RUN rm -rf ${BASE_DIR}/themes/eCloud && \ 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 +# Snappy theme +RUN rm -rf ${BASE_DIR}/themes/Murena && \ + curl -fsSL -o Murena-theme.tar.gz \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappy-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ + tar -xf Murena-theme.tar.gz -C /tmp/ && \ + mv /tmp/nextcloud-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ + chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \ + rm -rf Murena-theme.tar.gz ${BASE_DIR}/themes/example/ -- GitLab From abbf7263c77a2fc421a35c31be1a9f22252bd0c8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Mar 2023 13:29:16 +0530 Subject: [PATCH 02/11] snappy-theme added --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 176ba5ed..706ae6ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -215,6 +215,6 @@ RUN rm -rf ${BASE_DIR}/themes/Murena && \ curl -fsSL -o Murena-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappy-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ tar -xf Murena-theme.tar.gz -C /tmp/ && \ - mv /tmp/nextcloud-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ + mv /tmp/snappy-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \ rm -rf Murena-theme.tar.gz ${BASE_DIR}/themes/example/ -- GitLab From f9cd0c09d5f230b30c68670bc775df76045c3a09 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Mar 2023 13:33:40 +0530 Subject: [PATCH 03/11] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 706ae6ae..7b60bee4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="525503" ARG SNAPPY_VERSION="2.26.3" -RUN sed -i 's/24,0,10,1/24,0,10,5/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,10,1/24,0,10,6/' ${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 8db2110d28bed3f609a62eb55d5ffdbbff3a4513 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Mar 2023 13:48:32 +0530 Subject: [PATCH 04/11] snappy mail theme --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b60bee4..a2d5f102 100644 --- a/Dockerfile +++ b/Dockerfile @@ -213,8 +213,8 @@ RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federation # Snappy theme RUN rm -rf ${BASE_DIR}/themes/Murena && \ curl -fsSL -o Murena-theme.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappy-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ tar -xf Murena-theme.tar.gz -C /tmp/ && \ - mv /tmp/snappy-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ + mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \ rm -rf Murena-theme.tar.gz ${BASE_DIR}/themes/example/ -- GitLab From e37fbceb8d6145406f868d5285f1fa3bd877c800 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Mar 2023 14:09:28 +0530 Subject: [PATCH 05/11] snappy-theme moved --- Dockerfile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2d5f102..b71ab87d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -124,6 +124,15 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ +# Snappy theme +RUN rm -rf ${BASE_DIR}/themes/Murena && \ + curl -fsSL -o Murena-theme.tar.gz \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ + tar -xf Murena-theme.tar.gz -C /tmp/ && \ + mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ + chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \ + rm -rf Murena-theme.tar.gz ${BASE_DIR}/themes/example/ + # User Backend RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \ @@ -210,11 +219,4 @@ RUN rm -rf ${BASE_DIR}/themes/eCloud && \ 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 -# Snappy theme -RUN rm -rf ${BASE_DIR}/themes/Murena && \ - curl -fsSL -o Murena-theme.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ - tar -xf Murena-theme.tar.gz -C /tmp/ && \ - mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ - chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \ - rm -rf Murena-theme.tar.gz ${BASE_DIR}/themes/example/ + -- GitLab From 0e4ecfb86995d659bd63c85bc37ecca1ff4c5a2c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Mar 2023 14:10:51 +0530 Subject: [PATCH 06/11] snappy-theme moved --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b71ab87d..9d078a0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="522867" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG ECLOUD_DASHBOARD_JOB_ID="525503" ARG SNAPPY_VERSION="2.26.3" - +ARG SNAPPY_THEME_VERSION="1.2.2" RUN sed -i 's/24,0,10,1/24,0,10,6/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / @@ -156,7 +156,6 @@ ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="24.0.3" ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0" ARG OIDC_LOGIN_VERSION="2.4.0" -ARG SNAPPY_THEME_VERSION="1.2.2" # Patches COPY patches/ ${TMP_PATCH_DIR}/ -- GitLab From 40bd7685f07f4568d694acc569842c81b0fe4e76 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Mar 2023 14:20:24 +0530 Subject: [PATCH 07/11] extra line removed --- Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d078a0c..3e6dea42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -130,8 +130,7 @@ RUN rm -rf ${BASE_DIR}/themes/Murena && \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ tar -xf Murena-theme.tar.gz -C /tmp/ && \ mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ - chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \ - rm -rf Murena-theme.tar.gz ${BASE_DIR}/themes/example/ + chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ # User Backend RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ @@ -216,6 +215,4 @@ RUN rm -rf ${BASE_DIR}/themes/eCloud && \ # 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 sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js \ No newline at end of file -- GitLab From e62b2189119a5cbf585986a9ddd210e5bcf6dd16 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Mar 2023 14:25:10 +0530 Subject: [PATCH 08/11] rm removed --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e6dea42..5916a486 100644 --- a/Dockerfile +++ b/Dockerfile @@ -125,8 +125,7 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ # Snappy theme -RUN rm -rf ${BASE_DIR}/themes/Murena && \ - curl -fsSL -o Murena-theme.tar.gz \ +RUN curl -fsSL -o Murena-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ tar -xf Murena-theme.tar.gz -C /tmp/ && \ mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ -- GitLab From 79e6fb8c15a0b49756fe7ec0f8ee244d23152843 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Mar 2023 14:34:47 +0530 Subject: [PATCH 09/11] moved in base image --- Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5916a486..2bd97532 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,6 +80,13 @@ RUN curl -fsSL -o snappymail.tar.gz \ tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm snappymail.tar.gz; +# Snappy theme +RUN curl -fsSL -o Murena-theme.tar.gz \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ + tar -xf Murena-theme.tar.gz -C /tmp/ && \ + mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ + chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ + # Remove unzip when unzipping is done RUN apt-get -y remove unzip @@ -124,13 +131,6 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ -# Snappy theme -RUN curl -fsSL -o Murena-theme.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ - tar -xf Murena-theme.tar.gz -C /tmp/ && \ - mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ - chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ - # User Backend RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \ @@ -214,4 +214,4 @@ RUN rm -rf ${BASE_DIR}/themes/eCloud && \ # 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 \ No newline at end of file +RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js -- GitLab From d66d76c65d24521ad64b28daffe610107e2041f1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Mar 2023 14:37:53 +0530 Subject: [PATCH 10/11] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2bd97532..3299732c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="525503" ARG SNAPPY_VERSION="2.26.3" ARG SNAPPY_THEME_VERSION="1.2.2" -RUN sed -i 's/24,0,10,1/24,0,10,6/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,10,1/24,0,10,7/' ${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 7ff08c5afb7138be42c434f9398a3216c9c5cd8f Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 7 Mar 2023 14:41:19 +0530 Subject: [PATCH 11/11] remove tar file --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3299732c..0446bd1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,11 +81,12 @@ RUN curl -fsSL -o snappymail.tar.gz \ rm snappymail.tar.gz; # Snappy theme -RUN curl -fsSL -o Murena-theme.tar.gz \ +RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \ - tar -xf Murena-theme.tar.gz -C /tmp/ && \ + tar -xf Murena-snappymail-theme.tar.gz -C /tmp/ && \ mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \ - chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ + chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \ + rm -rf Murena-snappymail-theme.tar.gz # Remove unzip when unzipping is done RUN apt-get -y remove unzip -- GitLab