Fix open files in DocEditor + refactoring
This commit is contained in:
parent
6cb1d7ac21
commit
82f0731d7d
@ -44,7 +44,8 @@ if [ "${arch_name}" = "x86_64" ]; then
|
||||
docker compose -f db.yml up -d
|
||||
elif [ "${arch_name}" = "arm64" ]; then
|
||||
echo "CPU Type: arm64 -> run ddb.arm.yml"
|
||||
docker compose -f db.arm.yml up -d
|
||||
MYSQL_IMAGE=arm64v8/mysql:oracle \
|
||||
docker compose -f db.yml up -d
|
||||
else
|
||||
echo "Error: Unknown CPU Type: ${arch_name}."
|
||||
exit 1
|
||||
@ -56,7 +57,7 @@ docker compose -f redis.yml -f rabbitmq.yml -f ds.yml up -d
|
||||
|
||||
echo "Stop all backend services"
|
||||
DOCKERFILE=Dockerfile.dev \
|
||||
docker compose -f docspace.dev.yml down -v
|
||||
docker compose -f docspace.dev.yml down
|
||||
|
||||
echo "Build all backend services"
|
||||
DOCKERFILE=Dockerfile.dev \
|
||||
@ -79,4 +80,5 @@ GIT_BRANCH=$branch \
|
||||
SERVICE_DOCEDITOR=$doceditor \
|
||||
SERVICE_LOGIN=$login \
|
||||
SERVICE_CLIENT=$client \
|
||||
APP_URL_PORTAL="http://$local_ip:8092" \
|
||||
docker compose -f docspace.dev.yml up -d
|
@ -6,6 +6,7 @@
|
||||
DOCKER_TAG=latest
|
||||
CONTAINER_PREFIX=${PRODUCT}-
|
||||
MYSQL_VERSION=8.0.18
|
||||
MYSQL_IMAGE=mysql:${MYSQL_VERSION}
|
||||
ELK_VERSION=7.13.1
|
||||
SERVICE_PORT=5050
|
||||
DOCUMENT_SERVER_IMAGE_NAME=onlyoffice/4testing-documentserver-ee:latest
|
||||
|
@ -1,35 +0,0 @@
|
||||
version: "3.8"
|
||||
|
||||
services:
|
||||
onlyoffice-mysql-server:
|
||||
image: arm64v8/mysql:oracle
|
||||
command: --default-authentication-plugin=mysql_native_password
|
||||
cap_add:
|
||||
- SYS_NICE
|
||||
container_name: ${MYSQL_HOST}
|
||||
restart: always
|
||||
tty: true
|
||||
user: mysql
|
||||
expose:
|
||||
- "3306"
|
||||
ports:
|
||||
- 3307:3306
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
|
||||
MYSQL_DATABASE: ${MYSQL_DATABASE}
|
||||
MYSQL_USER: ${MYSQL_USER}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
||||
volumes:
|
||||
- mysql_data:/var/lib/mysql
|
||||
- ./config/mysql/conf.d/:/etc/mysql/conf.d
|
||||
networks:
|
||||
- ${NETWORK_NAME}
|
||||
tmpfs: /var/log/mysql/
|
||||
|
||||
networks:
|
||||
onlyoffice:
|
||||
name: ${NETWORK_NAME}
|
||||
driver: "bridge"
|
||||
|
||||
volumes:
|
||||
mysql_data:
|
@ -2,7 +2,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
onlyoffice-mysql-server:
|
||||
image: mysql:${MYSQL_VERSION}
|
||||
image: ${MYSQL_IMAGE}
|
||||
command: --default-authentication-plugin=mysql_native_password
|
||||
cap_add:
|
||||
- SYS_NICE
|
||||
@ -21,13 +21,13 @@ services:
|
||||
- mysql_data:/var/lib/mysql
|
||||
- ./config/mysql/conf.d/:/etc/mysql/conf.d
|
||||
networks:
|
||||
- ${NETWORK_NAME}
|
||||
- ${NETWORK_NAME}
|
||||
tmpfs: /var/log/mysql/
|
||||
|
||||
networks:
|
||||
onlyoffice:
|
||||
name: ${NETWORK_NAME}
|
||||
driver: 'bridge'
|
||||
driver: "bridge"
|
||||
|
||||
volumes:
|
||||
mysql_data:
|
||||
|
@ -14,6 +14,7 @@ x-service: &x-service-base
|
||||
APP_DOTNET_ENV: ${APP_DOTNET_ENV}
|
||||
APP_CORE_BASE_DOMAIN: ${APP_CORE_BASE_DOMAIN}
|
||||
APP_CORE_MACHINEKEY: ${APP_CORE_MACHINEKEY}
|
||||
APP_URL_PORTAL: ${APP_URL_PORTAL}
|
||||
DOCUMENT_SERVER_JWT_SECRET: ${DOCUMENT_SERVER_JWT_SECRET}
|
||||
DOCUMENT_SERVER_JWT_HEADER: ${DOCUMENT_SERVER_JWT_HEADER}
|
||||
DOCUMENT_SERVER_URL_PUBLIC: ${DOCUMENT_SERVER_URL_PUBLIC}
|
||||
|
Loading…
Reference in New Issue
Block a user