Fix bug #60688

.github/workflows/stable-build.yml

@@ -129,7 +129,7 @@ jobs:
            export PRODUCT_EDITION=${{ matrix.edition }}
            export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL }}
            export DOCKERFILE=Dockerfile
-           export BASE_VERSION=20.04
+           export BASE_IMAGE=ubuntu:20.04
            export PG_VERSION=12
            export TAG=${VERSION%.*}.${RELEASE_NUMBER}
            export PACKAGE_VERSION=$( echo ${VERSION} |  sed -E 's/(.*)\./\1-/')

.github/workflows/zap-ds.yaml

@@ -1,70 +0,0 @@
----
-name: Scanning DocumentServer with ZAP
-
-run-name: > 
-      ZAP DocumentServer ver: ${{ github.event.inputs.version }} from branch: ${{ github.event.inputs.branch }}
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Set DocumentServer version that will be deployed'
-        type: string
-        required: true
-      branch:
-        description: 'The branch from which the scan will be performed'
-        type: string
-        required: true
-jobs:
-  zap:
-    name: "Zap scanning DocumentServer"
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Run DS
-        id: run-ds
-        env:
-          TAG: ${{ github.event.inputs.version }}
-        run: |
-           # Create ssl certs
-           openssl genrsa -out tls.key 2048
-           openssl req -new -key tls.key -out tls.csr -subj "/C=RU/ST=NizhObl/L=NizhNov/O=RK-Tech/OU=TestUnit/CN=TestName"
-           openssl x509 -req -days 365 -in tls.csr -signkey tls.key -out tls.crt
-           openssl dhparam -out dhparam.pem 2048
-           sudo mkdir -p /app/onlyoffice/DocumentServer/data/certs
-           sudo cp ./tls.key /app/onlyoffice/DocumentServer/data/certs/
-           sudo cp ./tls.crt /app/onlyoffice/DocumentServer/data/certs/
-           sudo cp ./dhparam.pem /app/onlyoffice/DocumentServer/data/certs/
-           sudo chmod 400 /app/onlyoffice/DocumentServer/data/certs/tls.key
-           rm ./tls.key ./tls.crt ./dhparam.pem
-
-           # Run Ds with enabled ssl
-           export CONTAINER_NAME="documentserver"
-           sudo docker run -itd \
-                           --name ${CONTAINER_NAME} \
-                           -p 80:80 \
-                           -p 443:443 \
-                           -v /app/onlyoffice/DocumentServer/data:/var/www/onlyoffice/Data \
-                           onlyoffice/4testing-documentserver:${TAG}
-           sleep 60
-           sudo docker exec ${CONTAINER_NAME} sudo supervisorctl start ds:example
-           LOCAL_IP=$(hostname -I | awk '{print $1}')
-           echo "local-ip=${LOCAL_IP}" >> "$GITHUB_OUTPUT"
-
-      # Scan DocumentServer with ZAP.
-      # NOTE: Full scan get a lot of time.
-      # If you want make scan more faster (but less accurate) remove `cmd options` field
-      # -j mean that scanning use AJAX Spider, with this spider the scan takes approximately an hour
-      # Without any cmd options will be used default spider and the scan takes approximately ~10-15 minutes
-      - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.8.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          docker_name: 'ghcr.io/zaproxy/zaproxy:stable'
-          target: 'https://${{ steps.run-ds.outputs.local-ip }}/'
-          allow_issue_writing: false
-          cmd_options: '-j'

Dockerfile

@@ -1,36 +1,20 @@
-ARG BASE_VERSION=22.04
+ARG BASE_IMAGE=ubuntu:22.04
 
-ARG BASE_IMAGE=ubuntu:$BASE_VERSION
-
-FROM ${BASE_IMAGE} AS documentserver
+FROM ${BASE_IMAGE} as documentserver
 LABEL maintainer Ascensio System SIA <support@onlyoffice.com>
 
-ARG BASE_VERSION
 ARG PG_VERSION=14
 
-ENV OC_RELEASE_NUM=21
-ENV OC_RU_VER=12
-ENV OC_RU_REVISION_VER=0
-ENV OC_RESERVED_NUM=0
-ENV OC_RU_DATE=0
-ENV OC_PATH=${OC_RELEASE_NUM}${OC_RU_VER}000
-ENV OC_FILE_SUFFIX=${OC_RELEASE_NUM}.${OC_RU_VER}.${OC_RU_REVISION_VER}.${OC_RESERVED_NUM}.${OC_RU_DATE}${OC_FILE_SUFFIX}dbru
-ENV OC_VER_DIR=${OC_RELEASE_NUM}_${OC_RU_VER}
-ENV OC_DOWNLOAD_URL=https://download.oracle.com/otn_software/linux/instantclient/${OC_PATH}
-
-ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive PG_VERSION=${PG_VERSION} BASE_VERSION=${BASE_VERSION}
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive PG_VERSION=${PG_VERSION}
 
 ARG ONLYOFFICE_VALUE=onlyoffice
 
 RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
     apt-get -y update && \
     apt-get -yq install wget apt-transport-https gnupg locales lsb-release && \
-    wget -q -O /etc/apt/sources.list.d/mssql-release.list https://packages.microsoft.com/config/ubuntu/$BASE_VERSION/prod.list && \
-    wget -q -O - https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
-    apt-get -y update && \
     locale-gen en_US.UTF-8 && \
     echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
-    ACCEPT_EULA=Y apt-get -yq install \
+    apt-get -yq install \
         adduser \
         apt-utils \
         bomstrip \
@@ -38,7 +22,6 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
         cron \
         curl \
         htop \
-        libaio1 \
         libasound2 \
         libboost-regex-dev \
         libcairo2 \
@@ -51,7 +34,6 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
         libxml2 \
         libxss1 \
         libxtst6 \
-        mssql-tools18 \
         mysql-client \
         nano \
         net-tools \
@@ -62,13 +44,11 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
         pwgen \
         rabbitmq-server \
         redis-server \
+        software-properties-common \
         sudo \
         supervisor \
         ttf-mscorefonts-installer \
-        unixodbc-dev \
-        unzip \
         xvfb \
-        xxd \
         zlib1g && \
     if [  $(ls -l /usr/share/fonts/truetype/msttcorefonts | wc -l) -ne 61 ]; \
         then echo 'msttcorefonts failed to download'; exit 1; fi  && \
@@ -79,11 +59,6 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
     service postgresql restart && \
     sudo -u postgres psql -c "CREATE USER $ONLYOFFICE_VALUE WITH password '$ONLYOFFICE_VALUE';" && \
     sudo -u postgres psql -c "CREATE DATABASE $ONLYOFFICE_VALUE OWNER $ONLYOFFICE_VALUE;" && \
-    wget -O basic.zip ${OC_DOWNLOAD_URL}/instantclient-basic-linux.x64-${OC_FILE_SUFFIX}.zip && \
-    wget -O sqlplus.zip ${OC_DOWNLOAD_URL}/instantclient-sqlplus-linux.x64-${OC_FILE_SUFFIX}.zip && \
-    unzip -d /usr/share basic.zip && \
-    unzip -d /usr/share sqlplus.zip && \
-    mv /usr/share/instantclient_${OC_VER_DIR} /usr/share/instantclient && \
     service postgresql stop && \
     service redis-server stop && \
     service rabbitmq-server stop && \
@@ -94,7 +69,6 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
 COPY config/supervisor/supervisor /etc/init.d/
 COPY config/supervisor/ds/*.conf /etc/supervisor/conf.d/
 COPY run-document-server.sh /app/ds/run-document-server.sh
-COPY oracle/sqlplus /usr/bin/sqlplus
 
 EXPOSE 80 443
 
@@ -108,7 +82,6 @@ ARG PACKAGE_BASEURL="http://download.onlyoffice.com/install/documentserver/linux
 ENV COMPANY_NAME=$COMPANY_NAME \
     PRODUCT_NAME=$PRODUCT_NAME \
     PRODUCT_EDITION=$PRODUCT_EDITION \
-    DS_PLUGIN_INSTALLATION=false \
     DS_DOCKER_INSTALLATION=true
 
 RUN PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VERSION:+_$PACKAGE_VERSION}_${TARGETARCH:-$(dpkg --print-architecture)}.deb" && \
@@ -121,10 +94,6 @@ RUN PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VER
     sed "s/COMPANY_NAME/${COMPANY_NAME}/g" -i /etc/supervisor/conf.d/*.conf && \
     service supervisor stop && \
     chmod 755 /app/ds/*.sh && \
-    printf "\nGO" >> /var/www/$COMPANY_NAME/documentserver/server/schema/mssql/createdb.sql && \
-    printf "\nGO" >> /var/www/$COMPANY_NAME/documentserver/server/schema/mssql/removetbl.sql && \
-    printf "\nexit" >> /var/www/$COMPANY_NAME/documentserver/server/schema/oracle/createdb.sql && \
-    printf "\nexit" >> /var/www/$COMPANY_NAME/documentserver/server/schema/oracle/removetbl.sql && \
     rm -f /tmp/$PACKAGE_FILE && \
     rm -rf /var/log/$COMPANY_NAME && \
     rm -rf /var/lib/apt/lists/*

README.md

@@ -178,8 +178,7 @@ Below is the complete list of parameters that can be set using environment varia
 - **SSL_KEY_PATH**: The path to the SSL certificate's private key. Defaults to `/var/www/onlyoffice/Data/certs/tls.key`.
 - **SSL_DHPARAM_PATH**: The path to the Diffie-Hellman parameter. Defaults to `/var/www/onlyoffice/Data/certs/dhparam.pem`.
 - **SSL_VERIFY_CLIENT**: Enable verification of client certificates using the `CA_CERTIFICATES_PATH` file. Defaults to `false`
-- **NODE_EXTRA_CA_CERTS**: The [NODE_EXTRA_CA_CERTS](https://nodejs.org/api/cli.html#node_extra_ca_certsfile "Node.js documentation") to extend CAs with the extra certificates for Node.js. Defaults to `/var/www/onlyoffice/Data/certs/extra-ca-certs.pem`.
-- **DB_TYPE**: The database type. Supported values are `postgres`, `mariadb`, `mysql`, `mssql` or `oracle`. Defaults to `postgres`.
+- **DB_TYPE**: The database type. Supported values are `postgres`, `mariadb` or `mysql`. Defaults to `postgres`.
 - **DB_HOST**: The IP address or the name of the host where the database server is running.
 - **DB_PORT**: The database server port number.
 - **DB_NAME**: The name of a database to use. Should be existing on container startup.
@@ -208,7 +207,6 @@ Below is the complete list of parameters that can be set using environment varia
 - **METRICS_PREFIX**: Defines StatsD metrics prefix for backend services. Defaults to `ds.`.
 - **LETS_ENCRYPT_DOMAIN**: Defines the domain for Let's Encrypt certificate.
 - **LETS_ENCRYPT_MAIL**: Defines the domain administator mail address for Let's Encrypt certificate.
-- **PLUGINS_ENABLED**: Defines whether to enable default plugins. Defaults to `false`.
 
 ## Installing ONLYOFFICE Document Server integrated with Community and Mail Servers
 

config/supervisor/ds/ds-metrics.conf

@@ -9,5 +9,5 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/var/log/COMPANY_NAME/documentserver/metrics/err.log
 stderr_logfile_backups=0
 stderr_logfile_maxbytes=0
-autostart=false
-autorestart=false
+autostart=true
+autorestart=true

docker-bake.hcl

@@ -64,7 +64,7 @@ variable "LATEST" {
 
 ### ↓ Variables for UCS build ↓
 
-variable "BASE_VERSION" {
+variable "BASE_IMAGE" {
     default     = ""
 }
 
@@ -130,7 +130,7 @@ target "documentserver-ucs" {
         "COMPANY_NAME": "${COMPANY_NAME}"
         "PACKAGE_VERSION": "${PACKAGE_VERSION}"
         "PACKAGE_BASEURL": "${PACKAGE_BASEURL}"
-        "BASE_VERSION": "${BASE_VERSION}"
+        "BASE_IMAGE": "${BASE_IMAGE}"
         "PG_VERSION": "${PG_VERSION}"
     }
 }

docker-compose.yml

@@ -1,3 +1,4 @@
+version: '2'
 services:
   onlyoffice-documentserver:
     build:

oracle/sqlplus

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-CLIENTDIR=/usr/share/instantclient
-export LD_LIBRARY_PATH=$CLIENTDIR
-$CLIENTDIR/sqlplus $@
-

run-document-server.sh

@@ -2,21 +2,14 @@
 
 umask 0022
 
-start_process() {
-  "$@" &
-  CHILD=$!; wait "$CHILD"; CHILD="";
-}
-
 function clean_exit {
-  [[ -z "$CHILD" ]] || kill -s SIGTERM "$CHILD" 2>/dev/null
   if [ ${ONLYOFFICE_DATA_CONTAINER} == "false" ] && \
   [ ${ONLYOFFICE_DATA_CONTAINER_HOST} == "localhost" ]; then
     /usr/bin/documentserver-prepare4shutdown.sh
   fi
-  exit
 }
 
-trap clean_exit SIGTERM SIGQUIT SIGABRT SIGINT
+trap clean_exit SIGTERM
 
 # Define '**' behavior explicitly
 shopt -s globstar
@@ -30,9 +23,7 @@ DS_LOG_DIR="${LOG_DIR}/documentserver"
 LIB_DIR="/var/lib/${COMPANY_NAME}"
 DS_LIB_DIR="${LIB_DIR}/documentserver"
 CONF_DIR="/etc/${COMPANY_NAME}/documentserver"
-SUPERVISOR_CONF_DIR="/etc/supervisor/conf.d"
 IS_UPGRADE="false"
-PLUGINS_ENABLED=${PLUGINS_ENABLED:-false}
 
 ONLYOFFICE_DATA_CONTAINER=${ONLYOFFICE_DATA_CONTAINER:-false}
 ONLYOFFICE_DATA_CONTAINER_HOST=${ONLYOFFICE_DATA_CONTAINER_HOST:-localhost}
@@ -69,25 +60,6 @@ if [[ -z $SSL_KEY_PATH ]] && [[ -f ${SSL_CERTIFICATES_DIR}/${COMPANY_NAME}.key ]
 else
   SSL_KEY_PATH=${SSL_KEY_PATH:-${SSL_CERTIFICATES_DIR}/tls.key}
 fi
-
-#When set, the well known "root" CAs will be extended with the extra certificates in file
-NODE_EXTRA_CA_CERTS=${NODE_EXTRA_CA_CERTS:-${SSL_CERTIFICATES_DIR}/extra-ca-certs.pem}
-if [[ -f ${NODE_EXTRA_CA_CERTS} ]]; then
-  NODE_EXTRA_ENVIRONMENT="${NODE_EXTRA_CA_CERTS}"
-elif [[ -f ${SSL_CERTIFICATE_PATH} ]]; then
-  SSL_CERTIFICATE_SUBJECT=$(openssl x509 -subject -noout -in "${SSL_CERTIFICATE_PATH}" | sed 's/subject=//')
-  SSL_CERTIFICATE_ISSUER=$(openssl x509 -issuer -noout -in "${SSL_CERTIFICATE_PATH}" | sed 's/issuer=//')
-
-  #Add self-signed certificate to trusted list for validating Docs requests to the test example 
-  if [[ -n $SSL_CERTIFICATE_SUBJECT && $SSL_CERTIFICATE_SUBJECT == $SSL_CERTIFICATE_ISSUER ]]; then
-    NODE_EXTRA_ENVIRONMENT="${SSL_CERTIFICATE_PATH}"
-  fi
-fi
-
-if [[ -n $NODE_EXTRA_ENVIRONMENT ]]; then
-  sed -i "s|^environment=.*$|&,NODE_EXTRA_CA_CERTS=${NODE_EXTRA_ENVIRONMENT}|" /etc/supervisor/conf.d/*.conf
-fi
-
 CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-${SSL_CERTIFICATES_DIR}/ca-certificates.pem}
 SSL_DHPARAM_PATH=${SSL_DHPARAM_PATH:-${SSL_CERTIFICATES_DIR}/dhparam.pem}
 SSL_VERIFY_CLIENT=${SSL_VERIFY_CLIENT:-off}
@@ -105,9 +77,7 @@ NGINX_ONLYOFFICE_EXAMPLE_CONF="${NGINX_ONLYOFFICE_EXAMPLE_PATH}/includes/ds-exam
 NGINX_CONFIG_PATH="/etc/nginx/nginx.conf"
 NGINX_WORKER_PROCESSES=${NGINX_WORKER_PROCESSES:-1}
 # Limiting the maximum number of simultaneous connections due to possible memory shortage
-LIMIT=$(ulimit -n); [ $LIMIT -gt 1048576 ] && LIMIT=1048576
-NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-$LIMIT}
-RABBIT_CONNECTIONS=${RABBIT_CONNECTIONS:-$LIMIT}
+[ $(ulimit -n) -gt 1048576 ] && NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-1048576} || NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-$(ulimit -n)}
 
 JWT_ENABLED=${JWT_ENABLED:-true}
 
@@ -184,15 +154,6 @@ read_setting(){
     "mariadb"|"mysql")
       DB_PORT=${DB_PORT:-"3306"}
       ;;
-    "dameng")
-      DB_PORT=${DB_PORT:-"5236"}
-      ;;
-    "mssql")
-      DB_PORT=${DB_PORT:-"1433"}
-      ;;
-    "oracle")
-      DB_PORT=${DB_PORT:-"1521"}
-      ;;
     "")
       DB_PORT=${DB_PORT:-${POSTGRESQL_SERVER_PORT:-$(${JSON} services.CoAuthoring.sql.dbPort)}}
       ;;
@@ -271,31 +232,8 @@ waiting_for_connection(){
   done
 }
 
-waiting_for_db_ready(){
-  case $DB_TYPE in
-    "oracle")
-      PDB="XEPDB1"
-      ORACLE_SQL="sqlplus $DB_USER/$DB_PWD@//$DB_HOST:$DB_PORT/$PDB"
-      DB_TEST="echo \"SELECT version FROM V\$INSTANCE;\" | $ORACLE_SQL 2>/dev/null | grep \"Connected\" | wc -l"
-      ;;
-    *)
-      return
-      ;;
-  esac
-
-  for (( i=1; i <= 10; i++ )); do
-    RES=$(eval $DB_TEST)
-    if [ "$RES" -ne "0" ]; then
-      echo "Database is ready"
-      break
-    fi
-    sleep 5
-  done
-}
-
 waiting_for_db(){
   waiting_for_connection $DB_HOST $DB_PORT
-  waiting_for_db_ready
 }
 
 waiting_for_amqp(){
@@ -315,7 +253,6 @@ update_statsd_settings(){
   ${JSON} -I -e "this.statsd.host = '${METRICS_HOST}'"
   ${JSON} -I -e "this.statsd.port = '${METRICS_PORT}'"
   ${JSON} -I -e "this.statsd.prefix = '${METRICS_PREFIX}'"
-  sed -i -E "s/(autostart|autorestart)=.*$/\1=${METRICS_ENABLED}/g" ${SUPERVISOR_CONF_DIR}/ds-metrics.conf
 }
 
 update_db_settings(){
@@ -408,24 +345,10 @@ update_ds_settings(){
     ${JSON} -I -e "if(this.services.CoAuthoring.requestDefaults.rejectUnauthorized===undefined)this.services.CoAuthoring.requestDefaults.rejectUnauthorized=false"
   fi
 
-  WOPI_PRIVATE_KEY="${DATA_DIR}/wopi_private.key"
-  WOPI_PUBLIC_KEY="${DATA_DIR}/wopi_public.key"
-
-  [ ! -f "${WOPI_PRIVATE_KEY}" ] && echo -n "Generating WOPI private key..." && openssl genpkey -algorithm RSA -outform PEM -out "${WOPI_PRIVATE_KEY}" >/dev/null 2>&1 && echo "Done"
-  [ ! -f "${WOPI_PUBLIC_KEY}" ] && echo -n "Generating WOPI public key..." && openssl rsa -RSAPublicKey_out -in "${WOPI_PRIVATE_KEY}" -outform "MS PUBLICKEYBLOB" -out "${WOPI_PUBLIC_KEY}" >/dev/null 2>&1  && echo "Done"
-  WOPI_MODULUS=$(openssl rsa -pubin -inform "MS PUBLICKEYBLOB" -modulus -noout -in "${WOPI_PUBLIC_KEY}" | sed 's/Modulus=//' | xxd -r -p | openssl base64 -A)
-  WOPI_EXPONENT=$(openssl rsa -pubin -inform "MS PUBLICKEYBLOB" -text -noout -in "${WOPI_PUBLIC_KEY}" | grep -oP '(?<=Exponent: )\d+')
-  
-  ${JSON} -I -e "if(this.wopi===undefined)this.wopi={};"
-  ${JSON} -I -e "this.wopi.enable = ${WOPI_ENABLED}"
-  ${JSON} -I -e "this.wopi.privateKey = '$(awk '{printf "%s\\n", $0}' ${WOPI_PRIVATE_KEY})'"
-  ${JSON} -I -e "this.wopi.privateKeyOld = '$(awk '{printf "%s\\n", $0}' ${WOPI_PRIVATE_KEY})'"
-  ${JSON} -I -e "this.wopi.publicKey = '$(openssl base64 -in ${WOPI_PUBLIC_KEY} -A)'"
-  ${JSON} -I -e "this.wopi.publicKeyOld = '$(openssl base64 -in ${WOPI_PUBLIC_KEY} -A)'"
-  ${JSON} -I -e "this.wopi.modulus = '${WOPI_MODULUS}'"
-  ${JSON} -I -e "this.wopi.modulusOld = '${WOPI_MODULUS}'"
-  ${JSON} -I -e "this.wopi.exponent = ${WOPI_EXPONENT}"
-  ${JSON} -I -e "this.wopi.exponentOld = ${WOPI_EXPONENT}"
+  if [ "${WOPI_ENABLED}" == "true" ]; then
+    ${JSON} -I -e "if(this.wopi===undefined)this.wopi={}"
+    ${JSON} -I -e "this.wopi.enable = true"
+  fi
 
   if [ "${ALLOW_META_IP_ADDRESS}" = "true" ] || [ "${ALLOW_PRIVATE_IP_ADDRESS}" = "true" ]; then
     ${JSON} -I -e "if(this.services.CoAuthoring['request-filtering-agent']===undefined)this.services.CoAuthoring['request-filtering-agent']={}"
@@ -450,12 +373,6 @@ create_postgresql_db(){
   sudo -u postgres psql -c "CREATE DATABASE $DB_NAME OWNER $DB_USER;"
 }
 
-create_mssql_db(){
-  MSSQL="/opt/mssql-tools18/bin/sqlcmd -S $DB_HOST,$DB_PORT"
-
-  $MSSQL -U $DB_USER -P "$DB_PWD" -C -Q "IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = '$DB_NAME') BEGIN CREATE DATABASE $DB_NAME; END"
-}
-
 create_db_tbl() {
   case $DB_TYPE in
     "postgres")
@@ -464,12 +381,6 @@ create_db_tbl() {
     "mariadb"|"mysql")
       create_mysql_tbl
     ;;
-    "mssql")
-      create_mssql_tbl
-    ;;
-    "oracle")
-      create_oracle_tbl
-    ;;
   esac
 }
 
@@ -481,12 +392,6 @@ upgrade_db_tbl() {
     "mariadb"|"mysql")
       upgrade_mysql_tbl
     ;;
-    "mssql")
-      upgrade_mssql_tbl
-    ;;
-    "oracle")
-      upgrade_oracle_tbl
-    ;;
   esac
 }
 
@@ -509,22 +414,6 @@ upgrade_mysql_tbl() {
   $MYSQL $DB_NAME < "$APP_DIR/server/schema/mysql/createdb.sql" >/dev/null 2>&1
 }
 
-upgrade_mssql_tbl() {
-  CONN_PARAMS="-U $DB_USER -P "$DB_PWD" -C"
-  MSSQL="/opt/mssql-tools18/bin/sqlcmd -S $DB_HOST,$DB_PORT $CONN_PARAMS"
-
-  $MSSQL < "$APP_DIR/server/schema/mssql/removetbl.sql" >/dev/null 2>&1
-  $MSSQL < "$APP_DIR/server/schema/mssql/createdb.sql" >/dev/null 2>&1
-}
-
-upgrade_oracle_tbl() {
-  PDB="XEPDB1"
-  ORACLE_SQL="sqlplus $DB_USER/$DB_PWD@//$DB_HOST:$DB_PORT/$PDB"
-
-  $ORACLE_SQL @$APP_DIR/server/schema/oracle/removetbl.sql >/dev/null 2>&1
-  $ORACLE_SQL @$APP_DIR/server/schema/oracle/createdb.sql >/dev/null 2>&1
-}
-
 create_postgresql_tbl() {
   if [ -n "$DB_PWD" ]; then
     export PGPASSWORD=$DB_PWD
@@ -544,22 +433,6 @@ create_mysql_tbl() {
   $MYSQL $DB_NAME < "$APP_DIR/server/schema/mysql/createdb.sql" >/dev/null 2>&1
 }
 
-create_mssql_tbl() {  
-  create_mssql_db
-
-  CONN_PARAMS="-U $DB_USER -P "$DB_PWD" -C"
-  MSSQL="/opt/mssql-tools18/bin/sqlcmd -S $DB_HOST,$DB_PORT $CONN_PARAMS"
-
-  $MSSQL < "$APP_DIR/server/schema/mssql/createdb.sql" >/dev/null 2>&1
-}
-
-create_oracle_tbl() {
-  PDB="XEPDB1"
-  ORACLE_SQL="sqlplus $DB_USER/$DB_PWD@//$DB_HOST:$DB_PORT/$PDB"
-
-  $ORACLE_SQL @$APP_DIR/server/schema/oracle/createdb.sql >/dev/null 2>&1
-}
-
 update_welcome_page() {
   WELCOME_PAGE="${APP_DIR}-example/welcome/docker.html"
   if [[ -e $WELCOME_PAGE ]]; then
@@ -626,7 +499,7 @@ update_nginx_settings(){
     sed 's/linux/docker/' -i ${NGINX_ONLYOFFICE_EXAMPLE_CONF}
   fi
 
-  start_process documentserver-update-securelink.sh -s ${SECURE_LINK_SECRET:-$(pwgen -s 20)} -r false
+  documentserver-update-securelink.sh -s ${SECURE_LINK_SECRET:-$(pwgen -s 20)} -r false
 }
 
 update_log_settings(){
@@ -655,7 +528,7 @@ for i in ${DS_LIB_DIR}/App_Data/cache/files ${DS_LIB_DIR}/App_Data/docbuilder ${
 done
 
 # change folder rights
-for i in ${DS_LOG_DIR} ${DS_LOG_DIR}-example ${LIB_DIR}; do
+for i in ${LOG_DIR} ${LIB_DIR}; do
   chown -R ds:ds "$i"
   chmod -R 755 "$i"
 done
@@ -702,8 +575,6 @@ if [ ${ONLYOFFICE_DATA_CONTAINER_HOST} = "localhost" ]; then
         chmod 400 ${RABBITMQ_DATA}/.erlang.cookie
     fi
 
-    echo "ulimit -n $RABBIT_CONNECTIONS" >> /etc/default/rabbitmq-server
-
     LOCAL_SERVICES+=("rabbitmq-server")
     # allow Rabbitmq startup after container kill
     rm -rf /var/run/rabbitmq
@@ -770,23 +641,17 @@ service nginx start
 
 if [ "${LETS_ENCRYPT_DOMAIN}" != "" -a "${LETS_ENCRYPT_MAIL}" != "" ]; then
   if [ ! -f "${SSL_CERTIFICATE_PATH}" -a ! -f "${SSL_KEY_PATH}" ]; then
-    start_process documentserver-letsencrypt.sh ${LETS_ENCRYPT_MAIL} ${LETS_ENCRYPT_DOMAIN}
+    documentserver-letsencrypt.sh ${LETS_ENCRYPT_MAIL} ${LETS_ENCRYPT_DOMAIN}
   fi
 fi
 
 # Regenerate the fonts list and the fonts thumbnails
 if [ "${GENERATE_FONTS}" == "true" ]; then
-  start_process documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER}
+  documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER}
 fi
-
-if [ "${PLUGINS_ENABLED}" = "true" ]; then
-  echo -n Installing plugins, please wait...
-  start_process documentserver-pluginsmanager.sh -r false --update=\"${APP_DIR}/sdkjs-plugins/plugin-list-default.json\" >/dev/null
-  echo Done
-fi
-
-start_process documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER}
+documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER}
 
 echo "${JWT_MESSAGE}" 
 
-start_process tail -f /var/log/${COMPANY_NAME}/**/*.log
+tail -f /var/log/${COMPANY_NAME}/**/*.log &
+wait $!

tests/damengdb/.env

@@ -1 +0,0 @@
-VERSION=latest

tests/damengdb/README.md

@@ -1,19 +0,0 @@
-## Stand Documentserver with damengdb
-
-### How it works
-
-For deploy stand, you need:
-
-**STEP 1**: Build you own images, do it with command:
-   
-```bash
-docker compose build
-```
-
-**STEP 2**: Wait build and when it finish deploy with command:
-
-```bash
-docker compose up -d 
-```
-
-Thats all.

tests/damengdb/damengdb.Dockerfile

@@ -1,46 +0,0 @@
-FROM onlyoffice/damengdb:8.1.2 as damengdb
-
-ARG DM8_USER="SYSDBA"
-ARG DM8_PASS="SYSDBA001"
-ARG DB_HOST="localhost"
-ARG DB_PORT="5236"
-ARG DISQL_BIN="/opt/dmdbms/bin"
-
-SHELL ["/bin/bash", "-c"]
-
-COPY <<"EOF" /wait_dm_ready.sh
-#!/usr/bin/env bash
-
-function wait_dm_ready() {
-  cd /opt/dmdbms/bin
-  for i in `seq 1  10`; do
-    echo `./disql /nolog <<EOF
-CONN SYSDBA/SYSDBA001@localhost
-exit
-EOF` | grep  "connection failure" > /dev/null 2>&1
-    if [ $? -eq 0 ]; then
-      echo "DM Database is not OK, please wait..."
-      sleep 10
-    else
-      echo "DM Database is OK"
-      break
-    fi
-  done
-}
-
-wait_dm_ready
-
-EOF
-
-
-RUN   bash /opt/startup.sh > /dev/null 2>&1 \
-   &  mkdir -p /schema/damengdb \
-   && apt update -y ; apt install wget -y \
-   && wget https://raw.githubusercontent.com/ONLYOFFICE/server/master/schema/dameng/createdb.sql -P /schema/dameng/ \
-   && bash ./wait_dm_ready.sh \
-   && cd ${DISQL_BIN} \
-   && ./disql $DM8_USER/$DM8_PASS@$DB_HOST:$DB_PORT -e \
-      "create user "onlyoffice" identified by "onlyoffice" password_policy 0;" \
-   && echo "EXIT" | tee -a /schema/dameng/createdb.sql \
-   && ./disql $DM8_USER/$DM8_PASS@$DB_HOST:$DB_PORT \`/schema/dameng/createdb.sql \
-   && sleep 10

tests/damengdb/docker-compose.yml

@@ -1,67 +0,0 @@
-version: '2'
-services:
-  onlyoffice-documentserver:
-    build:
-      context: ../../.
-      dockerfile: Dockerfile
-      target: documentserver
-    container_name: onlyoffice-documentserver
-    depends_on:
-      - onlyoffice-dameng
-      - onlyoffice-rabbitmq
-    environment:
-      - DB_TYPE=dameng
-      - DB_HOST=onlyoffice-dameng
-      - DB_PORT=5236
-      - DB_NAME=onlyoffice
-      - DB_USER=onlyoffice
-      - AMQP_URI=amqp://guest:guest@onlyoffice-rabbitmq
-      # Costomize the JSON Web Token validation parameters if needed.
-      #- JWT_ENABLED=false
-      #- JWT_SECRET=secret
-      #- JWT_HEADER=Authorization
-      #- JWT_IN_BODY=true
-    ports:
-      - '80:80'
-      - '443:443'
-    stdin_open: true
-    restart: always
-    stop_grace_period: 60s
-    volumes:
-       - /var/www/onlyoffice/Data
-       - /var/log/onlyoffice
-       - /var/lib/onlyoffice/documentserver/App_Data/cache/files
-       - /var/www/onlyoffice/documentserver-example/public/files
-       - /usr/share/fonts
-       
-  onlyoffice-rabbitmq:
-    container_name: onlyoffice-rabbitmq
-    image: rabbitmq
-    restart: always
-    expose:
-      - '5672'
-
-  onlyoffice-dameng:
-    container_name: onlyoffice-dameng
-    build:
-      context: .
-      dockerfile: damengdb.Dockerfile
-      target: damengdb
-      args:
-        DM8_USER: SYSDBA
-        DM8_PASS: SYSDBA001
-        DB_HOST: localhost
-        DB_PORT: 5236
-    environment:
-      - PAGE_SIZE=16
-      - LD_LIBRARY_PATH=/opt/dmdbms/bin
-      - INSTANCE_NAME=dm8_01
-    restart: always
-    expose:
-      - '5236'
-    volumes:
-      - dameng_data:/opt/dmdbms/data
-
-volumes:
-  dameng_data:
-  

tests/mssql/README.md

@@ -1,17 +0,0 @@
-## Stand Documentserver with mssql
-
-### How it works
-
-For deploy stand:
-
-**STEP 1**: Build you own images:
-   
-```bash
-sudo docker-compose build
-```
-
-**STEP 2**: Wait build complete and when:
-
-```bash
-sudo docker-compose up -d 
-```

tests/mssql/create_db_user.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-#generate SA password
-SYMBOLS='!#$%&*+,-.:;=?@^_~'
-for (( i=1; i <= 20; i++ )); do
-  PASS=$(tr -dc "A-Za-z0-9$SYMBOLS" </dev/urandom | head -c 15)
-  if [[ $PASS == *[0-9]* && 
-        $PASS != $(echo "$PASS" | tr [:upper:] ' ') && 
-        $PASS != $(echo "$PASS" | tr [:lower:] ' ') && 
-        $PASS != $(echo "$PASS" | tr "$SYMBOLS" ' ') ]]; then
-    break
-  fi
-done
-export MSSQL_SA_PASSWORD=$PASS
-
-CONNECTION_STR="/opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P "$MSSQL_SA_PASSWORD" -C -Q"
-
-#start db
-/opt/mssql/bin/sqlservr &
-
-#wait for db up
-for (( i=1; i <= 10; i++ )); do
-  RES=$($CONNECTION_STR "SELECT @@VERSION;" 2>/dev/null | grep "affected" | wc -l)
-  if [ "$RES" -eq "1" ]; then
-    echo "Database is ready"
-    break
-  fi
-  sleep 10
-done
-
-#create new db user
-$CONNECTION_STR "IF NOT EXISTS (SELECT * FROM sys.sql_logins WHERE name = '$MSSQL_USER') BEGIN CREATE LOGIN $MSSQL_USER WITH PASSWORD = '$MSSQL_PASSWORD' , CHECK_POLICY = OFF; ALTER SERVER ROLE [dbcreator] ADD MEMBER [$MSSQL_USER]; END"

tests/mssql/docker-compose.yml

@@ -1,38 +0,0 @@
-version: '2.1'
-services:
-  onlyoffice-documentserver:
-    container_name: onlyoffice-documentserver
-    build:
-      context: ../../.
-      dockerfile: Dockerfile
-    depends_on:
-      - onlyoffice-mssql
-    environment:
-      - DB_TYPE=${DB_TYPE:-mssql}
-      - DB_HOST=${DB_HOST:-onlyoffice-mssql}
-      - DB_PORT=${DB_PORT:-1433}
-      - DB_NAME=${DB_NAME:-onlyoffice}
-      - DB_USER=${DB_USER:-onlyoffice}
-      - DB_PWD=${DB_PWD:-onlyoffice}
-    stdin_open: true
-    restart: always
-    ports:
-      - '80:80'
-
-  onlyoffice-mssql:
-    container_name: onlyoffice-mssql
-    build:
-      context: .
-      dockerfile: mssql.Dockerfile
-      args:
-        - MSSQL_DATABASE=${DB_NAME:-onlyoffice}
-        - MSSQL_USER=${DB_USER:-onlyoffice}
-        - MSSQL_PASSWORD=${DB_PWD:-onlyoffice}
-    restart: always
-    volumes:
-      - mssql_data:/var/opt/mssql
-    expose:
-      - '1433'
-
-volumes:
-  mssql_data:

tests/mssql/mssql.Dockerfile

@@ -1,9 +0,0 @@
-FROM mcr.microsoft.com/mssql/server:2022-latest as onlyoffice-mssql
-
-ENV ACCEPT_EULA=Y
-
-SHELL ["/bin/bash", "-c"]
-
-COPY create_db_user.sh /tmp/create_db_user.sh
-
-RUN bash /tmp/create_db_user.sh

tests/oracle/README.md

@@ -1,17 +0,0 @@
-## Stand Documentserver with oracle
-
-### How it works
-
-For deploy stand:
-
-**STEP 1**: Build you own images:
-   
-```bash
-sudo docker-compose build
-```
-
-**STEP 2**: Wait build complete and when:
-
-```bash
-sudo docker-compose up -d 
-```

tests/oracle/create_db_user.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-CONNECTION_STR="sqlplus sys/$ORACLE_PASSWORD@//localhost:1521/$ORACLE_DATABASE as sysdba"
-
-export ORACLE_PWD=$ORACLE_PASSWORD
-
-#start db
-/opt/oracle/runOracle.sh &
-
-#wait for db up
-for (( i=1; i <= 20; i++ )); do
-  RES=$(echo "SELECT version FROM V\$INSTANCE;" | $CONNECTION_STR 2>/dev/null | grep "Connected" | wc -l)
-  if [ "$RES" -ne "0" ]; then
-    echo "Database is ready"
-    break
-  fi
-  sleep 10
-done
-
-sleep 1
-
-#create new db user
-$CONNECTION_STR <<EOF
-CREATE USER $ORACLE_USER IDENTIFIED BY $ORACLE_PASSWORD;
-GRANT CREATE SESSION TO $ORACLE_USER;
-GRANT CREATE TABLE TO $ORACLE_USER; 
-ALTER USER $ORACLE_USER quota unlimited on USERS;
-EOF

tests/oracle/docker-compose.yml

@@ -1,38 +0,0 @@
-version: '2.1'
-services:
-  onlyoffice-documentserver:
-    container_name: onlyoffice-documentserver
-    build:
-      context: ../../.
-      dockerfile: Dockerfile
-    depends_on:
-      - onlyoffice-oracle
-    environment:
-      - DB_TYPE=${DB_TYPE:-oracle}
-      - DB_HOST=${DB_HOST:-onlyoffice-oracle}
-      - DB_PORT=${DB_PORT:-1521}
-      - DB_NAME=${DB_NAME:-xepdb1}
-      - DB_USER=${DB_USER:-onlyoffice}
-      - DB_PWD=${DB_PWD:-onlyoffice}
-    stdin_open: true
-    restart: always
-    ports:
-      - '80:80'
-
-  onlyoffice-oracle:
-    container_name: onlyoffice-oracle
-    build:
-      context: .
-      dockerfile: oracle.Dockerfile
-      args:
-        - ORACLE_DATABASE=${DB_NAME:-xepdb1}
-        - ORACLE_USER=${DB_USER:-onlyoffice}
-        - ORACLE_PASSWORD=${DB_PWD:-onlyoffice}
-    restart: always
-    volumes:
-      - oracle_data:/opt/oracle/oradata
-    expose:
-      - '1521'
-
-volumes:
-  oracle_data:

tests/oracle/oracle.Dockerfile

@@ -1,15 +0,0 @@
-FROM container-registry.oracle.com/database/express:21.3.0-xe as onlyoffice-oracle
-
-ARG ORACLE_DATABASE=
-ARG ORACLE_PASSWORD=
-ARG ORACLE_USER=
-
-ENV ORACLE_DATABASE=$ORACLE_DATABASE \
-    ORACLE_PASSWORD=$ORACLE_PASSWORD \
-    ORACLE_USER=$ORACLE_USER
-
-SHELL ["/bin/bash", "-c"]
-
-COPY create_db_user.sh /tmp/create_db_user.sh
-
-RUN bash /tmp/create_db_user.sh