Prevent service autostart during package installation

Bump database version to 8.1.3. Also disable build for documentserver image

Dockerfile

@@ -24,7 +24,7 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=nonint
 ARG ONLYOFFICE_VALUE=onlyoffice
 COPY fonts/ /usr/share/fonts/truetype/
 
-RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
+RUN echo "#!/bin/sh\nexit 101" > /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" && \
@@ -64,7 +64,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
         postgresql \
         postgresql-client \
         pwgen \
-        rabbitmq-server \
+        rabbitmq-server=3.12.1-1ubuntu1.2 \
         redis-server \
         sudo \
         supervisor \
@@ -81,20 +81,17 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
     sed -i "s/bind .*/bind 127.0.0.1/g" /etc/redis/redis.conf && \
     sed 's|\(application\/zip.*\)|\1\n    application\/wasm wasm;|' -i /etc/nginx/mime.types && \
     pg_conftool $PG_VERSION main set listen_addresses 'localhost' && \
-    service postgresql restart && \
+    service postgresql start && \
     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.$(dpkg --print-architecture | sed 's/amd64/x64/')-${OC_FILE_SUFFIX}.zip && \
     wget -O sqlplus.zip ${OC_DOWNLOAD_URL}/instantclient-sqlplus-linux.$(dpkg --print-architecture | sed 's/amd64/x64/')-${OC_FILE_SUFFIX}.zip && \
     unzip -o basic.zip -d /usr/share && \
     unzip -o sqlplus.zip -d /usr/share && \
+    rm -f basic.zip sqlplus.zip && \
     mv /usr/share/instantclient_${OC_VER_DIR} /usr/share/instantclient && \
     find /usr/lib /lib -name "libaio.so.1$PACKAGE_SUFFIX" -exec bash -c 'ln -sf "$0" "$(dirname "$0")/libaio.so.1"' {} \; && \
     service postgresql stop && \
-    service redis-server stop && \
-    service rabbitmq-server stop && \
-    service supervisor stop && \
-    service nginx stop && \
     rm -rf /var/lib/apt/lists/*
 
 COPY config/supervisor/supervisor /etc/init.d/

run-document-server.sh

@@ -784,10 +784,12 @@ for i in ${LOCAL_SERVICES[@]}; do
   service $i start
 done
 
-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
+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
 fi
 
 if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then

tests/damengdb/damengdb.Dockerfile

@@ -1,7 +1,7 @@
-FROM onlyoffice/damengdb:8.1.2 as damengdb
+FROM onlyoffice/damengdb:8.1.3 as damengdb
 
 ARG DM8_USER="SYSDBA"
-ARG DM8_PASS="SYSDBA001"
+ARG DM8_PASS="SYSDBA_dm001"
 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/SYSDBA001@localhost
+CONN SYSDBA/SYSDBA_dm001@localhost
 exit
 EOF` | grep  "connection failure" > /dev/null 2>&1
     if [ $? -eq 0 ]; then
@@ -41,14 +41,20 @@ 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 \
-   && apt update -y ; apt install wget -y \
-   && wget https://raw.githubusercontent.com/ONLYOFFICE/server/master/schema/dameng/createdb.sql -P /schema/dameng/ \
+   && export DEBIAN_FRONTEND=noninteractive \
+   && apt-get update \
+   && rm -rf /var/lib/apt/lists/* \
    && 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;" \
+      "create user \"${OO_DB_USER}\" identified by \"${OO_DB_PASS}\";" \
    && ./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,10 +1,7 @@
 version: '2'
 services:
   onlyoffice-documentserver:
-    build:
-      context: ../../.
-      dockerfile: Dockerfile
-      target: documentserver
+    image: onlyoffice/documentserver-ee:latest
     container_name: onlyoffice-documentserver
     depends_on:
       - onlyoffice-dameng
@@ -15,6 +12,7 @@ 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
@@ -49,7 +47,7 @@ services:
       target: damengdb
       args:
         DM8_USER: SYSDBA
-        DM8_PASS: SYSDBA001
+        DM8_PASS: SYSDBA_dm001
         DB_HOST: localhost
         DB_PORT: 5236
     environment: