Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f22e099 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Merge branch 'dev/update_nc_and_apps' into 'slim' 

Update nc and apps

See merge request !291
parents 723dc588 f1133578

README.md

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ This repository extends the official [Nextcloud](https://nextcloud.com) image wi 


- 📫 [Mail](https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail)

- 📁 [Files](https://github.com/nextcloud/server/tree/master/apps/files)

- 👥 [Contacts](https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/contacts)

- 📆 [Calendar](https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/calendar)

- 👥 [Contacts](https://github.com/nextcloud/contacts)

- 📆 [Calendar](https://github.com/nextcloud/calendar)

- 📝 [OnlyOffice](https://github.com/ONLYOFFICE/onlyoffice-nextcloud)

- ✍️ [Notes](https://github.com/nextcloud/notes)

- ✅ [Tasks](https://github.com/nextcloud/tasks)

docker-compose.local.yml

+4 −4
Original line number Diff line number Diff line 
services:

  db:

    image: postgres:16.10-alpine

    image: postgres:17.7-alpine

    restart: unless-stopped

    environment:

      - POSTGRES_DB=${DB_NAME}
@@ -21,7 +21,7 @@ services: 
      - worker-network



  redis:

    image: redis:7.4-alpine

    image: redis:8.4-alpine

    restart: unless-stopped

    healthcheck:

      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
@@ -32,7 +32,7 @@ services: 
      - worker-network



  syslog:

    image: grafana/alloy:v1.11.3

    image: grafana/alloy:v1.12.0

    restart: unless-stopped

    volumes:

      - ./config/alloy/config.alloy:/etc/alloy/config.alloy
@@ -67,7 +67,7 @@ services: 
      - nextcloud

  

  documentserver:

    image: onlyoffice/documentserver:9.1

    image: onlyoffice/documentserver:9.2

    restart: unless-stopped

    depends_on:

      db:

hooks.d/before-starting/murena-starting.sh

0 → 100755
+15 −0
Original line number Diff line number Diff line 
#!/bin/sh

set -eu



DATA_DIR="${NEXTCLOUD_DATA_DIR:-/var/www/html/data}"

TARGET_FILE="${DATA_DIR}/appdata_snappymail/_data_/_default_/admin_password.txt"



if [ ! -d "${DATA_DIR}" ]; then

    echo "[before-starting] Nextcloud data directory \"${DATA_DIR}\" is missing; skipping SnappyMail admin password cleanup."

    return 0 2>/dev/null || exit 0

fi



if [ -f "${TARGET_FILE}" ]; then

    rm -f "${TARGET_FILE}"

    echo "[before-starting] Removed SnappyMail admin password file at ${TARGET_FILE}."

fi

hooks.d/post-installation/murena-config.sh

+2 −0
Original line number Diff line number Diff line
@@ -39,3 +39,5 @@ occ config:app:set onlyoffice preview --value=false 
occ config:app:set onlyoffice customization_plugins --value=false

occ config:app:set onlyoffice customizationChat --value=false

occ config:app:set onlyoffice customizationFeedback --value=false



occ config:system:set appstoreenabled --type boolean --value=false

slim.Dockerfile

+6 −6
Original line number Diff line number Diff line 
FROM nextcloud:31.0.10-fpm AS nextcloud

FROM nextcloud:31.0.11-fpm AS nextcloud



# see $OC_Version from /usr/src/nextcloud/version.php

ENV NEXTCLOUD_VERSION_LONG=31.0.10.2

ENV NEXTCLOUD_VERSION_LONG=31.0.11.2



ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"



ARG CONTACTS_URL="https://gitlab.e.foundation/api/v4/projects/1238/packages/generic/contacts/v7.2.0+murena-20251111/contacts-v7.2.0+murena-20251111.tar.gz"

ARG CALENDAR_URL="https://gitlab.e.foundation/api/v4/projects/1199/packages/generic/calendar/v5.3.5+murena-20251016/calendar-v5.3.5+murena-20251016.tar.gz"

ARG THEME_HELPER_URL="https://gitlab.e.foundation/api/v4/projects/952/packages/generic/ecloud-theme-helper/v9.0.0/ecloud-theme-helper-v9.0.0.tar.gz"

ARG LAUNCHER_URL="https://gitlab.e.foundation/api/v4/projects/927/packages/generic/murena_launcher/v9.0.0/murena_launcher-v9.0.0.tar.gz"

ARG DASHBOARD_URL="https://gitlab.e.foundation/api/v4/projects/1195/packages/generic/murena-dashboard/v9.0.0/murena-dashboard-v9.0.0.tar.gz"

ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/v2.38.2+murena-20251117/snappymail-v2.38.2+murena-20251117.tar.gz"

ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/v2.38.2+murena-20251202/snappymail-v2.38.2+murena-20251202.tar.gz"

ARG OIDC_LOGIN_URL="https://gitlab.e.foundation/api/v4/projects/1496/packages/generic/oidc_login/v3.2.2+murena-20251028/oidc_login-v3.2.2+murena-20251028.tar.gz"



ARG CALENDAR_URL="https://github.com/nextcloud-releases/calendar/releases/download/v5.3.10/calendar-v5.3.10.tar.gz"

ARG CONTACTS_URL="https://github.com/nextcloud-releases/contacts/releases/download/v7.3.7/contacts-v7.3.7.tar.gz"

ARG NOTES_URL="https://github.com/nextcloud-releases/notes/releases/download/v4.12.4/notes-v4.12.4.tar.gz"

ARG TASKS_URL="https://github.com/nextcloud/tasks/releases/download/v0.17.1/tasks.tar.gz"

ARG SENTRY_URL="https://github.com/ChristophWurst/nextcloud_sentry/releases/download/v8.16.6/sentry-v8.16.6.tar.gz"

ARG SENTRY_URL="https://github.com/ChristophWurst/nextcloud_sentry/releases/download/v8.16.7/sentry-v8.16.7.tar.gz"

ARG ONLYOFFICE_URL="https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.11.0/onlyoffice.tar.gz"



ARG THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/315/packages/generic/eCloud/v31.0.3/eCloud-v31.0.3.tar.gz"