From 5b566629a3305b7c59a838343fa40d6b077f8bd4 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Tue, 31 Mar 2026 17:57:45 +0600 Subject: [PATCH 1/2] chore: update to v32.0.6.11 - update to final versions of apps for nc32 release --- Dockerfile | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index 37934c8..ff600d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,14 +4,14 @@ ARG TMP_PATCH_DIR="/tmp/build_patches" ARG CONTACTS_URL="https://gitlab.e.foundation/api/v4/projects/1238/packages/generic/contacts/v7.3.12+murena-20260325/contacts-v7.3.12+murena-20260325.tar.gz" ARG CALENDAR_URL="https://gitlab.e.foundation/api/v4/projects/1199/packages/generic/calendar/v5.5.11+murena-20260107/calendar-v5.5.11+murena-20260107.tar.gz" -ARG THEME_HELPER_URL="https://gitlab.e.foundation/api/v4/projects/952/packages/generic/ecloud-theme-helper/v11.0.0-beta.1/ecloud-theme-helper-v11.0.0-beta.1.tar.gz" -ARG LAUNCHER_URL="https://gitlab.e.foundation/api/v4/projects/927/packages/generic/murena_launcher/v10.0.0-beta/murena_launcher-v10.0.0-beta.tar.gz" -ARG DASHBOARD_URL="https://gitlab.e.foundation/api/v4/projects/1195/packages/generic/murena-dashboard/v10.0.0-beta/murena-dashboard-v10.0.0-beta.tar.gz" -ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/v2.38.2+murena-20260322/snappymail-v2.38.2+murena-20260322.tar.gz" +ARG THEME_HELPER_URL="https://gitlab.e.foundation/api/v4/projects/952/packages/generic/ecloud-theme-helper/v11.0.0/ecloud-theme-helper-v11.0.0.tar.gz" +ARG LAUNCHER_URL="https://gitlab.e.foundation/api/v4/projects/927/packages/generic/murena_launcher/v10.0.0/murena_launcher-v10.0.0.tar.gz" +ARG DASHBOARD_URL="https://gitlab.e.foundation/api/v4/projects/1195/packages/generic/murena-dashboard/v10.0.0/murena-dashboard-v10.0.0.tar.gz" +ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/2.38.2+murena-20260331/snappymail-2.38.2+murena-20260331.tar.gz" ARG OIDC_LOGIN_URL="https://gitlab.e.foundation/api/v4/projects/1496/packages/generic/oidc_login/v3.2.2+murena-20260323/oidc_login-v3.2.2+murena-20260323.tar.gz" ARG SNAPPY_THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/1377/packages/generic/snappymail/v4.0.5/snappymail-v4.0.5.tar.gz" -ARG EA_URL="https://gitlab.e.foundation/api/v4/projects/648/packages/generic/ecloud-accounts/v14.0.0-beta/ecloud-accounts-v14.0.0-beta.tar.gz" -ARG EMAIL_RECOVERY_URL="https://gitlab.e.foundation/api/v4/projects/868/packages/generic/email-recovery/v13.0.0-beta/email-recovery-v13.0.0-beta.tar.gz" +ARG EA_URL="https://gitlab.e.foundation/api/v4/projects/648/packages/generic/ecloud-accounts/v14.0.0/ecloud-accounts-v14.0.0.tar.gz" +ARG EMAIL_RECOVERY_URL="https://gitlab.e.foundation/api/v4/projects/868/packages/generic/email-recovery/v13.0.0/email-recovery-v13.0.0.tar.gz" ARG USER_MIGRATION_URL="https://gitlab.e.foundation/api/v4/projects/1468/packages/generic/user_migration/8.0.0+murena-20251216/user_migration-8.0.0+murena-20251216.tar.gz" ARG NOTES_URL="https://github.com/nextcloud-releases/notes/releases/download/v4.13.1/notes-v4.13.1.tar.gz" @@ -19,7 +19,7 @@ ARG MEMORIES_URL="https://github.com/pulsejet/memories/releases/download/v7.8.2/ ARG DROP_ACCOUNT_URL="https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.7.1.tar.gz" ARG GOOGLE_INTEGRATION_URL="https://github.com/nextcloud-releases/integration_google/releases/download/v4.2.0/integration_google-v4.2.0.tar.gz" -RUN sed -i 's/32,0,6,1/32,0,6,10/' ${BASE_DIR}/version.php +RUN sed -i 's/32,0,6,1/32,0,6,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 @@ -28,10 +28,10 @@ RUN apt-get update && apt-get install -y unzip ffmpeg RUN rm -rf ${BASE_DIR}/core/skeleton/* ${BASE_DIR}/themes/example \ - && mkdir -p ${BASE_DIR}/core/skeleton/Documents \ - && mkdir -p ${BASE_DIR}/core/skeleton/Images \ - && mkdir -p ${BASE_DIR}/themes/Murena \ - && mkdir -p ${BASE_DIR}/themes/eCloud + && mkdir -p ${BASE_DIR}/core/skeleton/Documents \ + && mkdir -p ${BASE_DIR}/core/skeleton/Images \ + && mkdir -p ${BASE_DIR}/themes/Murena \ + && mkdir -p ${BASE_DIR}/themes/eCloud # Install unzip for unzipping artifacts RUN apt-get update && apt-get install -y unzip ffmpeg syslog-ng @@ -62,7 +62,7 @@ RUN curl -sL ${GOOGLE_INTEGRATION_URL} | tar xzf - -C ${BASE_DIR}/custom_apps # Snappy theme RUN rm -rf ${BASE_DIR}/themes/Murena/* && \ - curl -sL ${SNAPPY_THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes/Murena/ + curl -sL ${SNAPPY_THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes/Murena/ #Workaround to fix line break when answering an email on firefox RUN sed -i 's/this.oEditor?.focus()/(this.oEditor?.focus(),navigator.userAgent.includes("Firefox")\&\&(window.getSelection().modify("move","forward","character"),window.getSelection().modify("move","backward","character")))/' ${BASE_DIR}/custom_apps/snappymail/app/snappymail/v/*/static/js/min/app.min.js @@ -113,7 +113,7 @@ RUN rm -rf ${TMP_PATCH_DIR} # Custom theme RUN rm -rf ${BASE_DIR}/themes/eCloud && \ - curl -sL ${THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes + curl -sL ${THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes # User Backend @@ -124,13 +124,13 @@ RUN rm -rf ${BASE_DIR}/themes/eCloud && \ # Selfhost theme 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-${SELFHOST_THEME_VERSION}/ ${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 + 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}/custom_apps/selfhost-theme-helper/ && \ + rm -f selfhost-theme-helper.tar.gz;\ + fi @@ -160,9 +160,9 @@ ARG LDAP_WRITE_SUPPORT_VERSION="1.14.0" ARG IS_SELFHOST=false RUN curl -fsSL -o ldap_write_support.tar.gz \ - "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support-v${LDAP_WRITE_SUPPORT_VERSION}.tar.gz" && \ - tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \ - rm ldap_write_support.tar.gz + "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support-v${LDAP_WRITE_SUPPORT_VERSION}.tar.gz" && \ + tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \ + rm ldap_write_support.tar.gz # Patches COPY patches/ ${TMP_PATCH_DIR}/ @@ -232,12 +232,12 @@ RUN sed -i 's/{attrs:{name:t.t("theming","Navigation bar settings")}}/{staticCla # Custom theme RUN rm -rf ${BASE_DIR}/themes/eCloud && \ - curl -sL ${THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes + curl -sL ${THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes # Remove Selfhost theme RUN if [ "$IS_SELFHOST" = false ]; then \ - rm -rf ${BASE_DIR}/custom_apps/selfhost-theme-helper;\ - fi + 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 -- GitLab From bd43469a9fad70e12c64db57cfc0d1a8af3a6a94 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Tue, 31 Mar 2026 18:04:02 +0600 Subject: [PATCH 2/2] chore: update nextcloud theme version to v32.0.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ff600d9..7205d5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -155,7 +155,7 @@ RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Co From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/315/packages/generic/eCloud/v32.0.1/eCloud-v32.0.1.tar.gz" +ARG THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/315/packages/generic/eCloud/v32.0.2/eCloud-v32.0.2.tar.gz" ARG LDAP_WRITE_SUPPORT_VERSION="1.14.0" ARG IS_SELFHOST=false -- GitLab