add eurooffice (#8052)

2026-06-04 18:00:10 +00:00 · 2026-06-04 12:42:02 +02:00
parent 792549c904
commit 6375921282
21 changed files with 251 additions and 22 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -31,6 +31,7 @@ updates:
    - "/Containers/collabora"
    - "/Containers/docker-socket-proxy"
    - "/Containers/domaincheck"
+    - "/Containers/eurooffice"
    - "/Containers/fulltextsearch"
    - "/Containers/imaginary"
    - "/Containers/mastercontainer"
--- a/Containers/apache/Caddyfile
+++ b/Containers/apache/Caddyfile
@@ -47,7 +47,14 @@ http://{$APACHE_HOST}.nextcloud-aio:23973, # For Collabora callback and WOPI req
        uri strip_prefix /onlyoffice
        reverse_proxy {$ONLYOFFICE_HOST}:80 {
            header_up X-Forwarded-Host {http.request.hostport}/onlyoffice
-            header_up X-Forwarded-Proto https
+        }
+    }
+
+    # EuroOffice
+    route /eurooffice/* {
+        uri strip_prefix /eurooffice
+        reverse_proxy {$EUROOFFICE_HOST}:80 {
+            header_up X-Forwarded-Host {http.request.hostport}/eurooffice
        }
    }

--- a/Containers/eurooffice/Dockerfile
+++ b/Containers/eurooffice/Dockerfile
@@ -0,0 +1,17 @@
+# syntax=docker/dockerfile:latest
+FROM ghcr.io/euro-office/documentserver:v9.3.1-beta.1
+
+# USER root is probably used
+
+COPY --chmod=775 healthcheck.sh /healthcheck.sh
+
+HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
+LABEL com.centurylinklabs.watchtower.enable="false" \
+    wud.watch="false" \
+    dockhand.update="false" \
+    org.opencontainers.image.title="EuroOffice for Nextcloud AIO" \
+    org.opencontainers.image.description="EuroOffice Document Server for Nextcloud All-in-One" \
+    org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
+    org.opencontainers.image.source="https://github.com/nextcloud/all-in-one" \
+    org.opencontainers.image.vendor="Nextcloud" \
+    org.opencontainers.image.documentation="https://github.com/nextcloud/all-in-one/blob/main/readme.md"
--- a/Containers/eurooffice/healthcheck.sh
+++ b/Containers/eurooffice/healthcheck.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "$AIO_LOG_LEVEL" = 'debug' ]; then
+    set -x
+fi
+
+nc -z 127.0.0.1 80 || exit 1
--- a/Containers/nextcloud/entrypoint.sh
+++ b/Containers/nextcloud/entrypoint.sh
@@ -867,6 +867,58 @@ else
    fi
 fi

+# EuroOffice
+if [ "$EUROOFFICE_ENABLED" = 'yes' ]; then
+    # Determine EuroOffice port based on host pattern
+    if echo "$EUROOFFICE_HOST" | grep -q "nextcloud-.*-eurooffice"; then
+        EUROOFFICE_PORT=80
+    else
+        EUROOFFICE_PORT=443
+    fi
+
+    count=0
+    while ! nc -z "$EUROOFFICE_HOST" "$EUROOFFICE_PORT" && [ "$count" -lt 90 ]; do
+        echo "Waiting for EuroOffice to become available..."
+        count=$((count+5))
+        sleep 5
+    done
+    if [ "$count" -ge 90 ]; then
+        bash /notify.sh "EuroOffice did not start in time!" "Skipping initialization and disabling eurooffice app."
+        php /var/www/html/occ app:disable eurooffice
+    else
+        # Install or enable EuroOffice app as needed
+        if ! [ -d "/var/www/html/custom_apps/eurooffice" ]; then
+            php /var/www/html/occ app:install eurooffice
+        elif [ "$(php /var/www/html/occ config:app:get eurooffice enabled)" != "yes" ]; then
+            php /var/www/html/occ app:enable eurooffice
+        elif [ "$SKIP_UPDATE" != 1 ]; then
+            php /var/www/html/occ app:update eurooffice
+        fi
+
+        # Set EuroOffice configuration
+        php /var/www/html/occ config:system:set eurooffice editors_check_interval --value="0" --type=integer 
+        php /var/www/html/occ config:system:set eurooffice jwt_secret --value="$EUROOFFICE_SECRET"
+        php /var/www/html/occ config:app:set eurooffice jwt_secret --value="$EUROOFFICE_SECRET"
+        php /var/www/html/occ config:system:set eurooffice jwt_header --value="AuthorizationJwt"
+
+        # Adjust the EuroOffice host if using internal pattern
+        if echo "$EUROOFFICE_HOST" | grep -q "nextcloud-.*-eurooffice"; then
+            EUROOFFICE_HOST="$NC_DOMAIN/eurooffice"
+            export EUROOFFICE_HOST
+        fi
+
+        php /var/www/html/occ config:app:set eurooffice DocumentServerUrl --value="https://$EUROOFFICE_HOST"
+    fi
+else
+    # Remove EuroOffice app if disabled and removal is requested
+    if [ "$REMOVE_DISABLED_APPS" = yes ] && \
+       [ -d "/var/www/html/custom_apps/eurooffice" ] && \
+       [ -n "$EUROOFFICE_SECRET" ] && \
+       [ "$(php /var/www/html/occ config:system:get eurooffice jwt_secret)" = "$EUROOFFICE_SECRET" ]; then
+        php /var/www/html/occ app:remove eurooffice
+    fi
+fi
+
 # Talk
 if [ "$TALK_ENABLED" = 'yes' ]; then
    set -x
--- a/nextcloud-aio-helm-chart/update-helm.sh
+++ b/nextcloud-aio-helm-chart/update-helm.sh
@@ -133,7 +133,7 @@ for variable in "${DEPLOYMENTS[@]}"; do
            sed -i "/^    spec:/r /tmp/initcontainers.clamav" "$variable"
        elif echo "$variable" | grep -q "nextcloud-deployment.yaml"; then
            sed -i "/^    spec:/r /tmp/initcontainers.nextcloud" "$variable"
-        elif echo "$variable" | grep -q "fulltextsearch" || echo "$variable" | grep -q "onlyoffice" || echo "$variable" | grep -q "collabora"; then
+        elif echo "$variable" | grep -q "fulltextsearch" || echo "$variable" | grep -q "onlyoffice" || echo "$variable" | grep -q "eurooffice" || echo "$variable" | grep -q "collabora"; then
            sed -i "/^    spec:/r /tmp/initcontainers" "$variable"
        fi
        volumeNames="$(grep -A1 mountPath "$variable" | grep -v mountPath | sed 's|.*name: ||' | sed '/^--$/d')"
@@ -499,7 +499,7 @@ cat << EOL > /tmp/security.conf
              {{- end }}
 EOL
 # shellcheck disable=SC1083
-find ./ \( -not -name '*collabora-deployment.yaml*' -not -name '*apache-deployment.yaml*' -not -name '*onlyoffice-deployment.yaml*' -name "*deployment.yaml" \) -exec sed -i "/^          securityContext:$/r /tmp/security.conf" \{} \; 
+find ./ \( -not -name '*collabora-deployment.yaml*' -not -name '*apache-deployment.yaml*' -not -name '*onlyoffice-deployment.yaml*' -not -name '*eurooffice-deployment.yaml*' -name "*deployment.yaml" \) -exec sed -i "/^          securityContext:$/r /tmp/security.conf" \{} \;

 # shellcheck disable=SC1083
 find ./ -name '*collabora-deployment.yaml*' -exec sed -i "/ADDITIONAL_COLLABORA_OPTIONS_PLACEHOLDER/d" \{} \;
--- a/php/containers.json
+++ b/php/containers.json
@@ -6,6 +6,7 @@
      "documentation": "https://github.com/nextcloud/all-in-one/discussions/2105",
      "depends_on": [
        "nextcloud-aio-onlyoffice",
+        "nextcloud-aio-eurooffice",
        "nextcloud-aio-collabora",
        "nextcloud-aio-talk",
        "nextcloud-aio-notify-push",
@@ -47,6 +48,7 @@
        "APACHE_PORT=%APACHE_PORT%",
        "AIO_LOG_LEVEL=%AIO_LOG_LEVEL%",
        "ONLYOFFICE_HOST=nextcloud-aio-onlyoffice",
+        "EUROOFFICE_HOST=nextcloud-aio-eurooffice",
        "TZ=%TIMEZONE%",
        "APACHE_MAX_SIZE=%APACHE_MAX_SIZE%",
        "APACHE_MAX_TIME=%NEXTCLOUD_MAX_TIME%",
@@ -223,6 +225,7 @@
        "TURN_SECRET=%TURN_SECRET%",
        "SIGNALING_SECRET=%SIGNALING_SECRET%",
        "ONLYOFFICE_SECRET=%ONLYOFFICE_SECRET%",
+        "EUROOFFICE_SECRET=%EUROOFFICE_SECRET%",
        "AIO_URL=%AIO_URL%",
        "AIO_LOG_LEVEL=%AIO_LOG_LEVEL%",
        "NC_AIO_VERSION=v%AIO_VERSION%",
@@ -230,10 +233,12 @@
        "CLAMAV_ENABLED=%CLAMAV_ENABLED%",
        "CLAMAV_HOST=nextcloud-aio-clamav",
        "ONLYOFFICE_ENABLED=%ONLYOFFICE_ENABLED%",
+        "EUROOFFICE_ENABLED=%EUROOFFICE_ENABLED%",
        "COLLABORA_ENABLED=%COLLABORA_ENABLED%",
        "COLLABORA_HOST=nextcloud-aio-collabora",
        "TALK_ENABLED=%TALK_ENABLED%",
        "ONLYOFFICE_HOST=nextcloud-aio-onlyoffice",
+        "EUROOFFICE_HOST=nextcloud-aio-eurooffice",
        "UPDATE_NEXTCLOUD_APPS=%UPDATE_NEXTCLOUD_APPS%",
        "TZ=%TIMEZONE%",
        "TALK_PORT=%TALK_PORT%",
@@ -357,6 +362,7 @@
      "secrets": [
        "REDIS_PASSWORD",
        "ONLYOFFICE_SECRET",
+        "EUROOFFICE_SECRET",
        "RECORDING_SECRET"
      ],
      "restart": "unless-stopped",
@@ -758,6 +764,50 @@
        "NET_RAW"
      ]
    },
+    {
+      "container_name": "nextcloud-aio-eurooffice",
+      "image_tag": "%AIO_CHANNEL%",
+      "display_name": "EuroOffice",
+      "image": "ghcr.io/nextcloud-releases/aio-eurooffice",
+      "init": true,
+      "healthcheck": {
+        "start_period": "60s",
+        "test": "/healthcheck.sh",
+        "interval": "30s",
+        "timeout": "30s",
+        "start_interval": "5s",
+        "retries": 9
+      },
+      "expose": [
+        "80"
+      ],
+      "internal_port": "80",
+      "environment": [
+        "AIO_LOG_LEVEL=%AIO_LOG_LEVEL%",
+        "LOG_LEVEL=%AIO_LOG_LEVEL%",
+        "TZ=%TIMEZONE%",
+        "JWT_ENABLED=true",
+        "JWT_HEADER=AuthorizationJwt",
+        "JWT_SECRET=%EUROOFFICE_SECRET%"
+      ],
+      "volumes": [
+        {
+          "source": "nextcloud_aio_eurooffice",
+          "destination": "/var/lib/euro-office",
+          "writeable": true
+        }
+      ],
+      "secrets": [
+        "EUROOFFICE_SECRET"
+      ],
+      "restart": "unless-stopped",
+      "profiles": [
+        "eurooffice"
+      ],
+      "cap_drop": [
+        "NET_RAW"
+      ]
+    },
    {
      "container_name": "nextcloud-aio-imaginary",
      "image_tag": "%AIO_CHANNEL%",
--- a/php/public/containers-form-submit.js
+++ b/php/public/containers-form-submit.js
@@ -22,9 +22,11 @@ document.addEventListener("DOMContentLoaded", function () {
    // Office suite radio buttons
    const collaboraRadio = document.getElementById('office-collabora');
    const onlyofficeRadio = document.getElementById('office-onlyoffice');
+    const euroofficeRadio = document.getElementById('office-eurooffice');
    const noneRadio = document.getElementById('office-none');
    const collaboraHidden = document.getElementById('collabora');
    const onlyofficeHidden = document.getElementById('onlyoffice');
+    const euroofficeHidden = document.getElementById('eurooffice');
    let initialOfficeSelection = null;

    optionsContainersCheckboxes.forEach(checkbox => {
@@ -36,11 +38,13 @@ document.addEventListener("DOMContentLoaded", function () {
    });

    // Store initial office suite selection
-    if (collaboraRadio && onlyofficeRadio && noneRadio) {
+    if (collaboraRadio && onlyofficeRadio && euroofficeRadio && noneRadio) {
        if (collaboraRadio.checked) {
            initialOfficeSelection = 'collabora';
        } else if (onlyofficeRadio.checked) {
            initialOfficeSelection = 'onlyoffice';
+        } else if (euroofficeRadio.checked) {
+            initialOfficeSelection = 'eurooffice';
        } else {
            initialOfficeSelection = 'none';
        }
@@ -57,20 +61,28 @@ document.addEventListener("DOMContentLoaded", function () {
        });

        // Check office suite changes and sync to hidden inputs
-        if (collaboraRadio && onlyofficeRadio && noneRadio && collaboraHidden && onlyofficeHidden) {
+        if (collaboraRadio && onlyofficeRadio && euroofficeRadio && noneRadio && collaboraHidden && onlyofficeHidden && euroofficeHidden) {
            let currentOfficeSelection = null;
            if (collaboraRadio.checked) {
                currentOfficeSelection = 'collabora';
                collaboraHidden.value = 'on';
                onlyofficeHidden.value = '';
+                euroofficeHidden.value = '';
            } else if (onlyofficeRadio.checked) {
                currentOfficeSelection = 'onlyoffice';
                collaboraHidden.value = '';
                onlyofficeHidden.value = 'on';
+                euroofficeHidden.value = '';
+            } else if (euroofficeRadio.checked) {
+                currentOfficeSelection = 'eurooffice';
+                collaboraHidden.value = '';
+                onlyofficeHidden.value = '';
+                euroofficeHidden.value = 'on';
            } else {
                currentOfficeSelection = 'none';
                collaboraHidden.value = '';
                onlyofficeHidden.value = '';
+                euroofficeHidden.value = '';
            }

            if (currentOfficeSelection !== initialOfficeSelection) {
@@ -144,9 +156,10 @@ document.addEventListener("DOMContentLoaded", function () {
    handleTalkVisibility();  // Ensure talk-recording is correctly initialized

    // Add event listeners for office suite radio buttons
-    if (collaboraRadio && onlyofficeRadio && noneRadio) {
+    if (collaboraRadio && onlyofficeRadio && euroofficeRadio && noneRadio) {
        collaboraRadio.addEventListener('change', checkForOptionContainerChanges);
        onlyofficeRadio.addEventListener('change', checkForOptionContainerChanges);
+        euroofficeRadio.addEventListener('change', checkForOptionContainerChanges);
        noneRadio.addEventListener('change', checkForOptionContainerChanges);
    }

--- a/php/public/disable-containers.js
+++ b/php/public/disable-containers.js
@@ -27,6 +27,12 @@ document.addEventListener("DOMContentLoaded", function(event) {
    const onlyoffice = document.getElementById("office-onlyoffice");
    onlyoffice.disabled = true;

+    // EuroOffice
+    const eurooffice = document.getElementById("office-eurooffice");
+    if (eurooffice) {
+        eurooffice.disabled = true;
+    }
+
    // Imaginary
    let imaginary = document.getElementById("imaginary");
    imaginary.disabled = true;
--- a/php/public/index.php
+++ b/php/public/index.php
@@ -153,6 +153,7 @@ $app->get('/containers', function (Request $request, Response $response, array $
        'current_channel' => $dockerActionManager->GetCurrentChannel(),
        'is_clamav_enabled' => $configurationManager->isClamavEnabled,
        'is_onlyoffice_enabled' => $configurationManager->isOnlyofficeEnabled,
+        'is_eurooffice_enabled' => $configurationManager->isEuroofficeEnabled,
        'is_collabora_enabled' => $configurationManager->isCollaboraEnabled,
        'is_talk_enabled' => $configurationManager->isTalkEnabled,
        'borg_restore_password' => $configurationManager->borgRestorePassword,
--- a/php/public/style.css
+++ b/php/public/style.css
@@ -606,13 +606,15 @@ input[type="checkbox"]:disabled:not(:checked) + label {
 }

 #office-collabora:checked + .office-card,
-#office-onlyoffice:checked + .office-card {
+#office-onlyoffice:checked + .office-card,
+#office-eurooffice:checked + .office-card {
    border-color: var(--color-nextcloud-blue);
    background: linear-gradient(135deg, rgba(0, 130, 201, 0.08) 0%, rgba(0, 130, 201, 0.02) 100%);
 }

 [data-theme="dark"] #office-collabora:checked + .office-card,
-[data-theme="dark"] #office-onlyoffice:checked + .office-card {
+[data-theme="dark"] #office-onlyoffice:checked + .office-card,
+[data-theme="dark"] #office-eurooffice:checked + .office-card {
    background: linear-gradient(135deg, rgba(0, 145, 242, 0.15) 0%, rgba(0, 145, 242, 0.03) 100%);
 }

@@ -631,13 +633,21 @@ input[type="checkbox"]:disabled:not(:checked) + label {
    color: var(--color-main-text);
 }

+.office-powered-by {
+    margin: 4px 0 0;
+    font-size: 13px;
+    color: var(--color-main-text);
+    opacity: 0.7;
+}
+
 .office-checkmark {
    flex-shrink: 0;
    display: none;
 }

 #office-collabora:checked + .office-card .office-checkmark,
-#office-onlyoffice:checked + .office-card .office-checkmark {
+#office-onlyoffice:checked + .office-card .office-checkmark,
+#office-eurooffice:checked + .office-card .office-checkmark {
    display: block;
 }

--- a/php/src/ContainerDefinitionFetcher.php
+++ b/php/src/ContainerDefinitionFetcher.php
@@ -78,6 +78,10 @@ readonly class ContainerDefinitionFetcher {
                if (!$this->configurationManager->isOnlyofficeEnabled) {
                    continue;
                }
+            } elseif ($entry['container_name'] === 'nextcloud-aio-eurooffice') {
+                if (!$this->configurationManager->isEuroofficeEnabled) {
+                    continue;
+                }
            } elseif ($entry['container_name'] === 'nextcloud-aio-collabora') {
                if (!$this->configurationManager->isCollaboraEnabled) {
                    continue;
@@ -194,6 +198,10 @@ readonly class ContainerDefinitionFetcher {
                        if (!$this->configurationManager->isOnlyofficeEnabled) {
                            continue;
                        }
+                    } elseif ($value === 'nextcloud-aio-eurooffice') {
+                        if (!$this->configurationManager->isEuroofficeEnabled) {
+                            continue;
+                        }
                    } elseif ($value === 'nextcloud-aio-collabora') {
                        if (!$this->configurationManager->isCollaboraEnabled) {
                            continue;
--- a/php/src/Controller/ConfigurationController.php
+++ b/php/src/Controller/ConfigurationController.php
@@ -81,12 +81,19 @@ readonly class ConfigurationController {
                if ($officeSuiteChoice === 'collabora') {
                    $this->configurationManager->isCollaboraEnabled = true;
                    $this->configurationManager->isOnlyofficeEnabled = false;
+                    $this->configurationManager->isEuroofficeEnabled = false;
                } elseif ($officeSuiteChoice === 'onlyoffice') {
                    $this->configurationManager->isCollaboraEnabled = false;
                    $this->configurationManager->isOnlyofficeEnabled = true;
+                    $this->configurationManager->isEuroofficeEnabled = false;
+                } elseif ($officeSuiteChoice === 'eurooffice') {
+                    $this->configurationManager->isCollaboraEnabled = false;
+                    $this->configurationManager->isOnlyofficeEnabled = false;
+                    $this->configurationManager->isEuroofficeEnabled = true;
                } else {
                    $this->configurationManager->isCollaboraEnabled = false;
                    $this->configurationManager->isOnlyofficeEnabled = false;
+                    $this->configurationManager->isEuroofficeEnabled = false;
                }
                $this->configurationManager->isClamavEnabled = isset($request->getParsedBody()['clamav']);
                $this->configurationManager->isTalkEnabled = isset($request->getParsedBody()['talk']);
--- a/php/src/Controller/DockerController.php
+++ b/php/src/Controller/DockerController.php
@@ -418,7 +418,7 @@ readonly class DockerController {
        <!DOCTYPE html>
        <html lang="en" class="overlay-iframe">
            <head>
-                <link rel="stylesheet" href="../../style.css?v9" media="all" />
+                <link rel="stylesheet" href="../../style.css?v11" media="all" />
                <script type="text/javascript" src="../../apply-theme.js?v1"></script>
                <script type="text/javascript" src="../../scroll-into-view.js"></script>
            </head>
--- a/php/src/Data/ConfigurationManager.php
+++ b/php/src/Data/ConfigurationManager.php
@@ -99,6 +99,11 @@ class ConfigurationManager
        set { $this->set('isOnlyofficeEnabled', $value); }
    }

+    public bool $isEuroofficeEnabled {
+        get => $this->get('isEuroofficeEnabled', false);
+        set { $this->set('isEuroofficeEnabled', $value); }
+    }
+
    public bool $isCollaboraEnabled {
        // Type-cast because old configs could have 1/0 for this key.
        get => (bool) $this->get('isCollaboraEnabled', true);
@@ -1087,6 +1092,7 @@ class ConfigurationManager
            'CLAMAV_ENABLED' => $this->isClamavEnabled ? 'yes' : '',
            'TALK_RECORDING_ENABLED' => $this->isTalkRecordingEnabled ? 'yes' : '',
            'ONLYOFFICE_ENABLED' => $this->isOnlyofficeEnabled ? 'yes' : '',
+            'EUROOFFICE_ENABLED' => $this->isEuroofficeEnabled ? 'yes' : '',
            'COLLABORA_ENABLED' => $this->isCollaboraEnabled ? 'yes' : '',
            'TALK_ENABLED' => $this->isTalkEnabled ? 'yes' : '',
            'UPDATE_NEXTCLOUD_APPS' => ($this->isDailyBackupRunning() && $this->areAutomaticUpdatesEnabled()) ? 'yes' : '',
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -27,7 +27,7 @@
            <script type="text/javascript" src="timezone.js?v1"></script>

            {# js for optional containers and additional containers forms #}
-            <script type="text/javascript" src="containers-form-submit.js?v7"></script>
+            <script type="text/javascript" src="containers-form-submit.js?v8"></script>

            {% set hasBackupLocation = borg_backup_host_location or borg_remote_repo %}
            {% set isAnyRunning = false %}
--- a/php/templates/includes/optional-containers.twig
+++ b/php/templates/includes/optional-containers.twig
@@ -14,6 +14,42 @@
        <p>Choose your preferred office suite. Only one can be enabled at a time.</p>
    {% endif %}
    <div class="office-suite-cards">
+        <input
+            type="radio"
+            id="office-eurooffice"
+            name="office_suite_choice"
+            value="eurooffice"
+            class="office-radio"
+            {% if is_eurooffice_enabled == true %}
+                checked="checked"
+            {% endif %}
+        >
+        <label class="office-card{{ isAnyRunning ? ' office-card-disabled' : '' }}" for="office-eurooffice">
+            <div class="office-card-header">
+                <div>
+                    <h4>Nextcloud Office</h4>
+                    <p class="office-powered-by">powered by Euro-Office</p>
+                </div>
+                <svg class="office-checkmark" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <circle cx="12" cy="12" r="10" fill="var(--color-nextcloud-blue)"/>
+                    <path d="M7 12L10.5 15.5L17 9" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                </svg>
+            </div>
+            <ul class="office-features">
+                <li>Good Nextcloud integration</li>
+                <li>Open source</li>
+                <li>Best performance</li>
+                <li>Limited ODF compatibility</li>
+                <li>Best Microsoft compatibility</li>
+                <li>Good security</li>
+            </ul>
+            {% if isAnyRunning == false %}
+                <a href="https://github.com/Euro-Office" target="_blank" class="office-learn-more" data-stop-event-propagation="true">
+                    Learn more
+                </a>
+            {% endif %}
+        </label>
+        <input type="hidden" id="eurooffice" name="eurooffice" value="" data-initial-state="{% if is_eurooffice_enabled == true %}true{% else %}false{% endif %}">
        <input
            type="radio"
            id="office-collabora"
@@ -26,7 +62,10 @@
        >
        <label class="office-card{{ isAnyRunning ? ' office-card-disabled' : '' }}" for="office-collabora">
            <div class="office-card-header">
-                <h4>Nextcloud Office</h4>
+                <div>
+                    <h4>Nextcloud Office</h4>
+                    <p class="office-powered-by">powered by Collabora Online</p>
+                </div>
                <svg class="office-checkmark" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                    <circle cx="12" cy="12" r="10" fill="var(--color-nextcloud-blue)"/>
                    <path d="M7 12L10.5 15.5L17 9" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
@@ -36,9 +75,9 @@
                <li>Best Nextcloud integration</li>
                <li>Open source</li>
                <li>Good performance</li>
-                <li>Best security: documents never leave your server</li>
                <li>Best ODF compatibility</li>
                <li>Best support for legacy files</li>
+                <li>Best security: documents never leave your server</li>
            </ul>
            {% if isAnyRunning == false %}
                <a href="https://www.collaboraoffice.com/code/" target="_blank" class="office-learn-more" data-stop-event-propagation="true">
@@ -60,18 +99,22 @@
        >
        <label class="office-card{{ isAnyRunning ? ' office-card-disabled' : '' }}" for="office-onlyoffice">
            <div class="office-card-header">
-                <h4>OnlyOffice</h4>
+                <div>
+                    <h4>ONLYOFFICE</h4>
+                    <p class="office-powered-by">by Ascensio System SIA</p>
+                </div>
                <svg class="office-checkmark" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                    <circle cx="12" cy="12" r="10" fill="var(--color-nextcloud-blue)"/>
                    <path d="M7 12L10.5 15.5L17 9" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
                </svg>
            </div>
            <ul class="office-features">
-                <li>Good Nextcloud integration</li>
-                <li>Open core</li>
+                <li>OK Nextcloud integration</li>
+                <li>Open Core</li>
                <li>Best performance</li>
-                <li>Best Microsoft compatibility</li>
                <li>Limited ODF compatibility</li>
+                <li>Best Microsoft compatibility</li>
+                <li>Good security</li>
            </ul>
            {% if isAnyRunning == false %}
                <a href="https://www.onlyoffice.com/" target="_blank" class="office-learn-more" data-stop-event-propagation="true">
@@ -90,7 +133,7 @@
                name="office_suite_choice"
                value=""
                class="office-radio"
-                {% if is_collabora_enabled == false and is_onlyoffice_enabled == false %}
+                {% if is_collabora_enabled == false and is_onlyoffice_enabled == false and is_eurooffice_enabled == false %}
                    checked="checked"
                {% endif %}
            >
@@ -224,7 +267,7 @@
 </form>
 <p><strong>Minimal system requirements:</strong> When any optional container is enabled, at least 2GB RAM, a dual-core CPU and 40GB system storage are required. When enabling ClamAV,  Nextcloud Talk Recording-server or Fulltextsearch, at least 3GB RAM are required. For Talk Recording-server additional 2 vCPUs are required. When enabling everything, at least 5GB RAM and a quad-core CPU are required. Recommended are at least 1GB more RAM than the minimal requirement. For further advice and recommendations see <strong><a target="_blank" href="https://github.com/nextcloud/all-in-one/discussions/1335">this documentation</a></strong></p>
 {% if isAnyRunning == true %}
-    <script type="text/javascript" src="disable-containers.js"></script>
+    <script type="text/javascript" src="disable-containers.js?v1"></script>
 {% endif %}

 {% if is_collabora_enabled == true and isAnyRunning == false and was_start_button_clicked == true %}
--- a/php/templates/layout.twig
+++ b/php/templates/layout.twig
@@ -2,7 +2,7 @@
 <html lang="en">
    <head>
        <title>AIO</title>
-        <link rel="stylesheet" href="style.css?v10" media="all" />
+        <link rel="stylesheet" href="style.css?v11" media="all" />
        <link rel="icon" href="img/favicon.png">
        <script type="text/javascript" src="forms.js?v2"></script>
        <script type="text/javascript" src="toggle-dark-mode.js?v2"></script>
--- a/php/templates/log.twig
+++ b/php/templates/log.twig
@@ -2,7 +2,7 @@
    <head>
        <title>AIO</title>
        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-        <link rel="stylesheet" href="style.css?v1">
+        <link rel="stylesheet" href="style.css?v11">
        <link rel="stylesheet" href="logs.css?v1">
        <link rel="icon" href="img/favicon.png">
        <script src="apply-theme.js?v1"></script>
--- a/readme.md
+++ b/readme.md
@@ -118,6 +118,7 @@ flowchart TB
        subgraph OPT["  🧩  Optional Built-in Containers  (enable in AIO interface)  "]
            COLLA(["📄 Nextcloud Office"]):::opt
            OO(["📄 OnlyOffice\nDocument Server"]):::opt
+            EO(["📄 EuroOffice\nDocument Server"]):::opt
            TALK(["🎙️ Talk\nVideo & Voice calls"]):::opt
            TALKREC(["🎬 Talk Recording"]):::opt
            FTS(["🔎 Full-text Search\n(Elasticsearch)"]):::opt
--- a/tests/QA/002-new-instance.md
+++ b/tests/QA/002-new-instance.md
@@ -13,7 +13,7 @@ For the below to work, it is important that you have a domain that you point ont
 - [ ] Below that you should see a section `Optional addons` which shows a checkbox list with addons that can be enabled or disabled.
    - [ ] Collabora, Imaginary, Talk and Whiteboard should be enabled, the rest disabled
    - [ ] Unchecking/Checking any of these should insert a button that allows to save the set config
-    - [ ] Checking OnlyOffice and Collabora at the same time should show a warning that this is not supported and should  not saving the new config
+    - [ ] Only one of Collabora, OnlyOffice and EuroOffice should be selectable at the same time
    - [ ] Recommended is to uncheck all options now
    - [ ] Clicking on the save button should reload the page and activate the new config
 - [ ] Clickig on the `Start containers` button should finally reveal a big spinning wheel that should block all elements on the side of being clicked.