mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-25 11:39:16 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: 应用停止使用 docker-compose stop

Browse Source
This commit is contained in:
zhengkunwang223 2022-12-04 12:59:09 +08:00 committed by zhengkunwang223
parent 4307673f7b
commit bd1c8b2fd8
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backend/app/service/app_install.go
View File

@ -376,13 +376,17 @@ func syncById(installId uint) error {
errorContainers []string errorContainers []string
notFoundContainers []string notFoundContainers []string
runningContainers []string runningContainers []string
exitedContainers []string
) )
for _, n := range containers { for _, n := range containers {
if n.State != "running" { switch n.State {
errorContainers = append(errorContainers, n.Names[0]) case "exited":
} else { exitedContainers = append(exitedContainers, n.Names[0])
case "running":
runningContainers = append(runningContainers, n.Names[0]) runningContainers = append(runningContainers, n.Names[0])
default:
errorContainers = append(errorContainers, n.Names[0])
} }
} }
for _, old := range containerNames { for _, old := range containerNames {
@ -401,6 +405,7 @@ func syncById(installId uint) error {
containerCount := len(containers) containerCount := len(containers)
errCount := len(errorContainers) errCount := len(errorContainers)
notFoundCount := len(notFoundContainers) notFoundCount := len(notFoundContainers)
existedCount := len(exitedContainers)
normalCount := len(containerNames) normalCount := len(containerNames)
runningCount := len(runningContainers) runningCount := len(runningContainers)
@ -409,16 +414,17 @@ func syncById(installId uint) error {
appInstall.Message = "container is not found" appInstall.Message = "container is not found"
return appInstallRepo.Save(&appInstall) return appInstallRepo.Save(&appInstall)
} }
if errCount == 0 && notFoundCount == 0 { if errCount == 0 && existedCount == 0 {
appInstall.Status = constant.Running appInstall.Status = constant.Running
return appInstallRepo.Save(&appInstall) return appInstallRepo.Save(&appInstall)
} }
if existedCount == normalCount {
appInstall.Status = constant.Stopped
return appInstallRepo.Save(&appInstall)
}
if errCount == normalCount { if errCount == normalCount {
appInstall.Status = constant.Error appInstall.Status = constant.Error
} }
if notFoundCount == normalCount {
appInstall.Status = constant.Stopped
}
if runningCount < normalCount { if runningCount < normalCount {
appInstall.Status = constant.UnHealthy appInstall.Status = constant.UnHealthy
} }

2
backend/utils/compose/compose.go
View File

@ -13,7 +13,7 @@ func Up(filePath string) (string, error) {
} }
func Down(filePath string) (string, error) { func Down(filePath string) (string, error) {
cmd := exec.Command("docker-compose", "-f", filePath, "down") cmd := exec.Command("docker-compose", "-f", filePath, "stop")
stdout, err := cmd.CombinedOutput() stdout, err := cmd.CombinedOutput()
return string(stdout), err return string(stdout), err
} }

4
frontend/src/views/app-store/installed/index.vue
View File

@ -50,9 +50,7 @@
trigger="hover" trigger="hover"
:content="row.message" :content="row.message"
> >
<template #reference> <template #reference>{{ row.status }}</template>
<el-tag type="error">{{ row.status }}</el-tag>
</template>
</el-popover> </el-popover>
<el-tag v-else> <el-tag v-else>