center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor: 添加一些安装脚本的控制参数

Browse Source
This commit is contained in:
xuwei-fit2cloud 2024-10-22 16:13:09 +08:00
parent 60bdc03bef
commit 9997102af2
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/dataease/templates/application.yml
View File

@ -23,6 +23,8 @@ dataease:
limit: ${DE_EXPORT_DATASET_LIMIT} limit: ${DE_EXPORT_DATASET_LIMIT}
origin-list: ${DE_ORIGIN_LIST} origin-list: ${DE_ORIGIN_LIST}
login_timeout: ${DE_LOGIN_TIMEOUT} login_timeout: ${DE_LOGIN_TIMEOUT}
selenium-server: ${DE_SELENIUM_SERVER}
dataease-servers: ${DE_SERVERS}
task: task:
executor: executor:
address: http://sync-task-actuator:9001 address: http://sync-task-actuator:9001

11
installer/dectl
View File

@ -49,18 +49,21 @@ function usage() {
} }
function _generate_compose_file_args() { function _generate_compose_file_args() {
if [[ $DE_INSTALL_MODE != "community" ]];then if [[ $DE_INSTALL_MODE != "community" ]];then
compose_files="${compose_files} -f docker-compose-apisix.yml" if [[ -f $DE_RUNNING_BASE/docker-compose-apisix.yml ]] && [[ "$DE_EXTERNAL_APISIX" != "true" ]];then
if [[ -f $DE_RUNNING_BASE/docker-compose-task.yml ]];then compose_files="${compose_files} -f docker-compose-apisix.yml"
fi
if [[ -f $DE_RUNNING_BASE/docker-compose-task.yml ]] && [[ "$DE_EXTERNAL_SYNC_TASK" != "true" ]];then
compose_files="${compose_files} -f docker-compose-task.yml" compose_files="${compose_files} -f docker-compose-task.yml"
fi fi
if [[ -f $DE_RUNNING_BASE/docker-compose-selenium.yml ]];then if [[ -f $DE_RUNNING_BASE/docker-compose-selenium.yml ]] && [[ "$DE_EXTERNAL_SELENIUM" != "true" ]];then
compose_files="${compose_files} -f docker-compose-selenium.yml" compose_files="${compose_files} -f docker-compose-selenium.yml"
fi fi
fi fi
} }
function _check_apisix_init() { function _check_apisix_init() {
if [[ $DE_INSTALL_MODE != "community" ]];then if [[ $DE_INSTALL_MODE != "community" ]] && [[ "$DE_EXTERNAL_APISIX" != "true" ]];then
_prepare_apisix _prepare_apisix
fi fi
} }

13
installer/install.conf
View File

@ -27,18 +27,31 @@ DE_MYSQL_PASSWORD=Password123@mysql
DE_MYSQL_PARAMS="autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true" DE_MYSQL_PARAMS="autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true"
# 定时报告镜像配置 # 定时报告镜像配置
## 是否使用外部 Selenium，若使用外部 Selenium，则限制参数无效
DE_EXTERNAL_SELENIUM=false
## Selenium 服务地址
DE_SELENIUM_SERVER=http://de-selenium:4444/wd/hub
## selenium 镜像 CPU 限制 ## selenium 镜像 CPU 限制
DE_SELENIUM_CPU_LIMIT='1' DE_SELENIUM_CPU_LIMIT='1'
## selenium 镜像 内存 限制 ## selenium 镜像 内存 限制
DE_SELENIUM_MEM_LIMIT=2g DE_SELENIUM_MEM_LIMIT=2g
# APISIX配置 # APISIX配置
## 是否使用外部 APISIX
DE_EXTERNAL_APISIX=false
## 使用外部 APISIX，则下列参数无效
## APISIX dashboard 端口 ## APISIX dashboard 端口
DE_APISIX_DASHBOARD_PORT=9000 DE_APISIX_DASHBOARD_PORT=9000
## APISIX 端口 ## APISIX 端口
DE_APISIX_PORT=9080 DE_APISIX_PORT=9080
# 同步模块配置
## 是否使用外部同步模块
DE_EXTERNAL_SYNC_TASK=false
# 其他配置 # 其他配置
DE_EXPORT_VIEWS_LIMIT=100000 DE_EXPORT_VIEWS_LIMIT=100000
DE_EXPORT_DATASET_LIMIT=100000 DE_EXPORT_DATASET_LIMIT=100000
DE_ORIGIN_LIST="http://localhost:8000" DE_ORIGIN_LIST="http://localhost:8000"
## DataEase 节点列表，用于多节点部署，节点以逗号分隔，如 192.168.1.101,192.168.1.102
DE_SERVERS=dataease