Merge release/12.7.0 into master

2025-04-18 15:24:01 +03:00 · 2024-10-31 13:10:39 +00:00 · 2024-10-31 13:10:39 +00:00 · c03f03df67
commit c03f03df67
parent 540b30ddfe a83eecc206
5 changed files with 28 additions and 26 deletions
--- a/README.md
+++ b/README.md
@ -463,21 +463,24 @@ After that switch to the repository folder:
 cd Docker-CommunityServer
 ```

-For the mail server correct work, open one of the files depending on the product you use:
-
-* [docker-compose.yml](https://github.com/ONLYOFFICE/Docker-CommunityServer/blob/master/docker-compose.groups.yml) for Community Server (distributed as ONLYOFFICE Groups)
-* [docker-compose.yml](https://github.com/ONLYOFFICE/Docker-CommunityServer/blob/master/docker-compose.workspace.yml) for ONLYOFFICE Workspace Community Edition 
-* [docker-compose.yml](https://github.com/ONLYOFFICE/Docker-CommunityServer/blob/master/docker-compose.workspace_enterprise.yml) for ONLYOFFICE Workspace Enterprise Edition
-
-For working on `Ubuntu 22.04` and `Debian 11` or later, you need to use docker-compose versions v2.16.0 or later and uncomment the cgroup line in the yml file
-
-Then replace the `${MAIL_SERVER_HOSTNAME}` variable with your own hostname for the **Mail Server**. After that, assuming you have docker-compose installed, execute the following command:
+For the mail server correct work, you need to set a variable with your own hostname for the **Mail Server**:

 ```bash
-cd link-to-your-modified-docker-compose
-docker-compose up -d
+export MAIL_SERVER_HOSTNAME="your-own-hostname"
 ```

+After that, assuming you have docker-compose version 2.16.0 or later installed, execute the following command:
+
+```bash
+docker-compose -f docker-compose.workspace_enterprise.yml up -d
+```
+
+The instructions for running ONLYOFFICE Workspace Enterprise Edition are used as an example, if you need to run a different version, specify a different file:
+
+* [docker-compose.groups.yml](https://github.com/ONLYOFFICE/Docker-CommunityServer/blob/master/docker-compose.groups.yml) for Community Server (distributed as ONLYOFFICE Groups)
+* [docker-compose.workspace.yml](https://github.com/ONLYOFFICE/Docker-CommunityServer/blob/master/docker-compose.workspace.yml) for ONLYOFFICE Workspace Community Edition 
+* [docker-compose.workspace_enterprise.yml](https://github.com/ONLYOFFICE/Docker-CommunityServer/blob/master/docker-compose.workspace_enterprise.yml) for ONLYOFFICE Workspace Enterprise Edition
+
 ## Upgrading ONLYOFFICE Community Server

 To upgrade to a newer release, please follow these easy steps:
--- a/docker-compose.groups.yml
+++ b/docker-compose.groups.yml
@ -1,4 +1,3 @@
-version: '3'
 services:
  onlyoffice-mysql-server:
    container_name: onlyoffice-mysql-server
@ -16,7 +15,7 @@ services:
     - mysql_data:/var/lib/mysql
  onlyoffice-community-server:
    container_name: onlyoffice-community-server
-    image: onlyoffice/communityserver:12.0.1.1748
+    image: onlyoffice/communityserver:12.6.0.1900
    depends_on:
     - onlyoffice-mysql-server
     - onlyoffice-elasticsearch
@ -41,7 +40,7 @@ services:
    tty: true
    restart: always
    privileged: true
-#    cgroup: host
+    cgroup: host
    volumes:
     - community_data:/var/www/onlyoffice/Data
     - community_log:/var/log/onlyoffice
@ -77,7 +76,7 @@ services:
    container_name: onlyoffice-control-panel
    depends_on:
     - onlyoffice-community-server
-    image: onlyoffice/controlpanel:3.1.1.467
+    image: onlyoffice/controlpanel:3.5.2.530
    environment:
     - ONLYOFFICE_CORE_MACHINEKEY=core_secret
    expose:
--- a/docker-compose.workspace.yml
+++ b/docker-compose.workspace.yml
@ -1,4 +1,3 @@
-version: '3'
 services:
  onlyoffice-mysql-server:
    container_name: onlyoffice-mysql-server
@ -16,7 +15,7 @@ services:
     - mysql_data:/var/lib/mysql
  onlyoffice-community-server:
    container_name: onlyoffice-community-server
-    image: onlyoffice/communityserver:12.0.1.1748
+    image: onlyoffice/communityserver:12.6.0.1900
    depends_on:
     - onlyoffice-mysql-server
     - onlyoffice-document-server
@ -54,7 +53,7 @@ services:
    tty: true
    restart: always
    privileged: true
-#    cgroup: host
+    cgroup: host
    volumes:
     - community_data:/var/www/onlyoffice/Data
     - community_log:/var/log/onlyoffice
@ -89,7 +88,7 @@ services:
      - "9300"
  onlyoffice-document-server:
    container_name: onlyoffice-document-server
-    image: onlyoffice/documentserver:7.1.1.23
+    image: onlyoffice/documentserver:8.1
    stdin_open: true
    tty: true
    restart: always
@ -139,7 +138,7 @@ services:
     - onlyoffice-document-server
     - onlyoffice-mail-server
     - onlyoffice-community-server
-    image: onlyoffice/controlpanel:3.1.1.467
+    image: onlyoffice/controlpanel:3.5.2.530
    environment:
     - ONLYOFFICE_CORE_MACHINEKEY=core_secret
    expose:
--- a/docker-compose.workspace_enterprise.yml
+++ b/docker-compose.workspace_enterprise.yml
@ -1,4 +1,3 @@
-version: '3'
 services:
  onlyoffice-mysql-server:
    container_name: onlyoffice-mysql-server
@ -16,7 +15,7 @@ services:
     - mysql_data:/var/lib/mysql
  onlyoffice-community-server:
    container_name: onlyoffice-community-server
-    image: onlyoffice/communityserver:12.0.1.1748
+    image: onlyoffice/communityserver:12.6.0.1900
    depends_on:
     - onlyoffice-mysql-server
     - onlyoffice-document-server
@ -54,7 +53,7 @@ services:
    tty: true
    restart: always
    privileged: true
-#    cgroup: host
+    cgroup: host
    volumes:
     - community_data:/var/www/onlyoffice/Data
     - community_log:/var/log/onlyoffice
@ -89,7 +88,7 @@ services:
      - "9300"
  onlyoffice-document-server:
    container_name: onlyoffice-document-server
-    image: onlyoffice/documentserver-ee:7.1.1.23
+    image: onlyoffice/documentserver-ee:8.1
    stdin_open: true
    tty: true
    restart: always
@ -139,7 +138,7 @@ services:
     - onlyoffice-document-server
     - onlyoffice-mail-server
     - onlyoffice-community-server
-    image: onlyoffice/controlpanel:3.1.1.467
+    image: onlyoffice/controlpanel:3.5.2.530
    environment:
     - ONLYOFFICE_CORE_MACHINEKEY=core_secret
    expose:
--- a/run-community-server.sh
+++ b/run-community-server.sh
@ -33,7 +33,8 @@ DOCKER_ENABLED=${DOCKER_ENABLED:-true};
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 NGINX_CONF_DIR="/etc/nginx/sites-enabled"
 CPU_PROCESSOR_COUNT=${CPU_PROCESSOR_COUNT:-$(cat /proc/cpuinfo | grep -i processor | awk '{print $1}' | grep -i processor | wc -l)};
-NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-$(ulimit -n)};
+# Limiting the maximum number of simultaneous connections due to possible memory shortage
+[ $(ulimit -n) -gt 1048576 ] && NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-1048576} || NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-$(ulimit -n)}
 NGINX_WORKER_PROCESSES=${NGINX_WORKER_PROCESSES:-1}
 SERVICE_SSO_AUTH_HOST_ADDR=${SERVICE_SSO_AUTH_HOST_ADDR:-${CONTROL_PANEL_PORT_80_TCP_ADDR}};
 DEFAULT_APP_CORE_MACHINEKEY="$(sudo sed -n '/"core.machinekey"/s!.*value\s*=\s*"\([^"]*\)".*!\1!p' ${APP_ROOT_DIR}/web.appsettings.config)";
@ -660,6 +661,7 @@ set +x

 find "${APP_SERVICES_DIR}/ASC.UrlShortener/config" -type f -name "*.json" -exec sed -i \
 -e "s!\(\"host\":\).*,!\1 \"${MYSQL_SERVER_HOST}\",!" \
+-e "/\"sql\": {/,/}/ s!\(\"port\":\).*,!\1 ${MYSQL_SERVER_PORT},!" \
 -e "s!\(\"user\":\).*,!\1 \"${MYSQL_SERVER_USER}\",!" \
 -e "s!\(\"password\":\).*,!\1 \"${MYSQL_SERVER_PASS//!/\\!}\",!" \
 -e "s!\(\"database\":\).*!\1 \"${MYSQL_SERVER_DB_NAME}\"!" {} \;