Merge pull request #11624 from owncloud/fix_ocis_full

feat: added the onlyoffice ee license to the ocis deployment.

Author: 2403905

deployments/examples/ocis_full/.env

@@ -219,6 +219,16 @@ CLAMAV_DOCKER_TAG=
 #ONLYOFFICE=:onlyoffice.yml
 # Domain for OnlyOffice. Defaults to "onlyoffice.owncloud.test".
 ONLYOFFICE_DOMAIN=
+# Set onlyoffice/documentserver-ee to use the Enterprise Edition.
+#ONLYOFFICE_IMAGE=onlyoffice/documentserver-ee
+# Defaults to "latest". Optional: pin a version (recommended)
+ONLYOFFICE_DOCKER_TAG=
+# Runtime env (works for both; EE typically wants these).
+#ONLYOFFICE_JWT_ENABLED=false
+#ONLYOFFICE_REDIS_HOST=localhost
+#ONLYOFFICE_REDIS_PORT=6379
+# EE only: path to your license on the host.
+#ONLYOFFICE_LICENSE_LOCAL=./config/onlyoffice/license.lic
 
 
 ### Mail Server Settings ###

deployments/examples/ocis_full/config/onlyoffice/entrypoint-override.sh

@@ -4,4 +4,10 @@ set -e
 # we can't mount it directly because the run-document-server.sh script wants to move it
 cp /etc/onlyoffice/documentserver/local.dist.json /etc/onlyoffice/documentserver/local.json
 
+# Ensure license file has the correct permissions
+if [ -f /var/www/onlyoffice/Data/license.lic ]; then
+  echo "Fixing permissions on license.lic..."
+  chmod 644 /var/www/onlyoffice/Data/license.lic || true
+fi
+
 /app/ds/run-document-server.sh

deployments/examples/ocis_full/onlyoffice.yml

@@ -46,7 +46,7 @@ services:
   onlyoffice:
     # if you want to use oo enterprise edition, use: onlyoffice/documentserver-ee:<version>
     # note, you also need to add a volume, see below
-    image: onlyoffice/documentserver:9.0.4
+    image: ${ONLYOFFICE_IMAGE:-onlyoffice/documentserver}:${ONLYOFFICE_DOCKER_TAG:-latest}
     # changelog https://github.com/ONLYOFFICE/DocumentServer/releases
     networks:
       ocis-net:
@@ -56,14 +56,19 @@ services:
     environment:
       WOPI_ENABLED: "true"
       # self-signed certificates
-      USE_UNAUTHORIZED_STORAGE: "${INSECURE:-false}"
+      USE_UNAUTHORIZED_STORAGE: ${INSECURE:-false}
+      JWT_ENABLED: ${ONLYOFFICE_JWT_ENABLED:-false}
+      REDIS_SERVER_HOST: ${ONLYOFFICE_REDIS_HOST:-localhost}
+      REDIS_SERVER_PORT: ${ONLYOFFICE_REDIS_PORT:-6379}
     volumes:
       # paths are relative to the main compose file
       - ./config/onlyoffice/entrypoint-override.sh:/entrypoint-override.sh
       - ./config/onlyoffice/local.json:/etc/onlyoffice/documentserver/local.dist.json
-      # if you want to use oo enterprise edition, you need to add a volume for the license file
-      # for details see: Registering your Enterprise Edition version -->
+      # Mount the license file only if using enterprise edition.
+      # For details see: Registering your Enterprise Edition version:
       # https://helpcenter.onlyoffice.com/installation/docs-enterprise-install-docker.aspx
+      # Uncomment and set ONLYOFFICE_LICENSE_LOCAL to the license file path.
+      #- ${ONLYOFFICE_LICENSE_LOCAL:-/dev/null}:/var/www/onlyoffice/Data/license.lic:ro
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.onlyoffice.entrypoints=https"

deployments/examples/ocis_full/web_extensions/externalsites.yml

@@ -1,6 +1,8 @@
 ---
 services:
   ocis:
+    volumes:
+      - ./config/ocis/apps.yaml:/etc/ocis/apps.yaml
     depends_on:
       externalsites-init:
         condition: service_completed_successfully