vrr/Docker-DocumentServer
2
0
Fork 0
mirror of https://github.com/thomisus/Docker-DocumentServer.git synced 2026-07-09 17:18:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: actualize damengdb stand

Browse source 
Bump database version to 8.1.3. Also disable build for documentserver image
This commit is contained in:
danilapog 2026-02-26 15:04:36 +03:00
parent 58051c573f
commit 69256014cc
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/damengdb/damengdb.Dockerfile
View file

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

8
tests/damengdb/docker-compose.yml
View file

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