fix: 修改 docker 服务状态判断

pull/69/head
ssongliu 2022-12-08 11:56:07 +08:00
parent a6140aa647
commit e7bf661eca
3 changed files with 9 additions and 10 deletions

View File

@ -2,7 +2,6 @@ package service
import (
"bufio"
"context"
"encoding/json"
"io/ioutil"
"os"
@ -11,7 +10,6 @@ import (
"github.com/1Panel-dev/1Panel/backend/app/dto"
"github.com/1Panel-dev/1Panel/backend/constant"
"github.com/1Panel-dev/1Panel/backend/utils/docker"
"github.com/pkg/errors"
)
@ -40,20 +38,20 @@ type daemonJsonItem struct {
func (u *DockerService) LoadDockerStatus() string {
status := constant.StatusRunning
cli, err := docker.NewDockerClient()
if err != nil {
status = constant.Stopped
}
pong, err := cli.Ping(context.Background())
if !pong.Experimental || err != nil {
cmd := exec.Command("systemctl", "is-active", "docker")
stdout, err := cmd.CombinedOutput()
if string(stdout) != "active\n" || err != nil {
status = constant.Stopped
}
return status
}
func (u *DockerService) LoadDockerConf() *dto.DaemonJsonConf {
status := constant.StatusRunning
if _, err := docker.NewDockerClient(); err != nil {
cmd := exec.Command("systemctl", "is-active", "docker")
stdout, err := cmd.CombinedOutput()
if string(stdout) != "active\n" || err != nil {
status = constant.Stopped
}
fileSetting, err := settingRepo.Get(settingRepo.WithByKey("DaemonJsonPath"))

View File

@ -90,7 +90,7 @@ const form = reactive({
from: 'edit',
path: '',
file: '',
template: 0,
template: null as number,
});
const rules = reactive({
name: [Rules.requiredInput, Rules.name],

View File

@ -176,6 +176,7 @@ const onOperator = async (operation: string) => {
operation: operation,
};
await dockerOperate(param);
search();
changeMode();
ElMessage.success(i18n.global.t('commons.msg.operationSuccess'));
};