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

Merge pull request #8455 from dataease/pr@v2_fix_installer

Browse Source 
fix: 修复 installer 停止服务的逻辑判断错误
This commit is contained in:
fit2cloudrd 2024-03-12 15:52:05 +08:00 committed by GitHub
commit 6d4a15234d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
installer/dectl
View File

@ -49,7 +49,10 @@ 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 -f docker-compose-task.yml" compose_files="${compose_files} -f docker-compose-apisix.yml"
if [[ -f $DE_RUNNING_BASE/docker-compose-task.yml ]];then
compose_files="${compose_files} -f docker-compose-task.yml"
fi
fi fi
} }
function _check_apisix_init() { function _check_apisix_init() {

2
installer/install.sh
View File

@ -23,7 +23,7 @@ if [ -f /usr/bin/dectl ]; then
sed -i -e "s#DE_BASE=.*#DE_BASE=${DE_BASE}#g" dectl sed -i -e "s#DE_BASE=.*#DE_BASE=${DE_BASE}#g" dectl
\cp dectl /usr/local/bin && chmod +x /usr/local/bin/dectl \cp dectl /usr/local/bin && chmod +x /usr/local/bin/dectl
if [[ ! -f /etc/systemd/system/dataease.service ]];then if [[ -f /etc/systemd/system/dataease.service ]];then
systemctl stop dataease systemctl stop dataease
else else
dectl stop dectl stop