Merge branch hotfix/v9.3.1 into develop

run-document-server.sh

@@ -784,12 +784,10 @@ for i in ${LOCAL_SERVICES[@]}; do
   service $i start
 done
 
-if [ "${DB_TYPE}" = "postgres" ]; then
-  PG_DB_EXISTS=$(PGPASSWORD="$DB_PWD" psql -h ${DB_HOST} -p${DB_PORT} -U "${DB_USER}" -tAc "SELECT 1 FROM pg_database WHERE datname='${DB_NAME}';" 2>/dev/null)
-  if [ ${PG_NEW_CLUSTER} = "true" ] || [ "${PG_DB_EXISTS}" != "1" ]; then
-    create_postgresql_db
-    create_postgresql_tbl
-  fi
+PG_DB_EXISTS=$(PGPASSWORD="$DB_PWD" psql -h ${DB_HOST} -p${DB_PORT} -U "${DB_USER}" -tAc "SELECT 1 FROM pg_database WHERE datname='${DB_NAME}';" 2>/dev/null)
+if [ ${PG_NEW_CLUSTER} = "true" ] || [ "${PG_DB_EXISTS}" != "1" ]; then
+  create_postgresql_db
+  create_postgresql_tbl
 fi
 
 if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then

tests/damengdb/damengdb.Dockerfile

@@ -1,7 +1,7 @@
-FROM onlyoffice/damengdb:8.1.3 as damengdb
+FROM onlyoffice/damengdb:8.1.2 as damengdb
 
 ARG DM8_USER="SYSDBA"
-ARG DM8_PASS="SYSDBA_dm001"
+ARG DM8_PASS="SYSDBA001"
 ARG DB_HOST="localhost"
 ARG DB_PORT="5236"
 ARG DISQL_BIN="/opt/dmdbms/bin"
@@ -15,7 +15,7 @@ function wait_dm_ready() {
   cd /opt/dmdbms/bin
   for i in `seq 1  10`; do
     echo `./disql /nolog <<EOF
-CONN SYSDBA/SYSDBA_dm001@localhost
+CONN SYSDBA/SYSDBA001@localhost
 exit
 EOF` | grep  "connection failure" > /dev/null 2>&1
     if [ $? -eq 0 ]; then
@@ -41,20 +41,14 @@ GRANT ALL PRIVILEGES ON sysdba.TASK_RESULT TO onlyoffice;
 
 EOF
 
-ADD https://raw.githubusercontent.com/ONLYOFFICE/server/master/schema/dameng/createdb.sql /schema/dameng/createdb.sql
-
-ARG OO_DB_USER="onlyoffice"
-ARG OO_DB_PASS="Onlyoffice_2026"
-
 RUN   bash /opt/startup.sh > /dev/null 2>&1 \
    &  mkdir -p /schema/damengdb \
-   && export DEBIAN_FRONTEND=noninteractive \
-   && apt-get update \
-   && rm -rf /var/lib/apt/lists/* \
+   && 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 \"${OO_DB_USER}\" identified by \"${OO_DB_PASS}\";" \
+      "create user "onlyoffice" identified by "onlyoffice" password_policy 0;" \
    && ./disql $DM8_USER/$DM8_PASS@$DB_HOST:$DB_PORT -e \
       "GRANT SELECT ON DBA_TAB_COLUMNS TO onlyoffice;" \
    && echo "EXIT" | tee -a /schema/dameng/createdb.sql \

tests/damengdb/docker-compose.yml

@@ -1,7 +1,10 @@
 version: '2'
 services:
   onlyoffice-documentserver:
-    image: onlyoffice/documentserver-ee:latest
+    build:
+      context: ../../.
+      dockerfile: Dockerfile
+      target: documentserver
     container_name: onlyoffice-documentserver
     depends_on:
       - onlyoffice-dameng
@@ -12,7 +15,6 @@ services:
       - DB_PORT=5236
       - DB_NAME=onlyoffice
       - DB_USER=onlyoffice
-      - DB_PWD=Onlyoffice_2026
       - AMQP_URI=amqp://guest:guest@onlyoffice-rabbitmq
       # Costomize the JSON Web Token validation parameters if needed.
       #- JWT_ENABLED=false
@@ -47,7 +49,7 @@ services:
       target: damengdb
       args:
         DM8_USER: SYSDBA
-        DM8_PASS: SYSDBA_dm001
+        DM8_PASS: SYSDBA001
         DB_HOST: localhost
         DB_PORT: 5236
     environment: