From e7bf661eca79fadcbc27327861558ae994bd5665 Mon Sep 17 00:00:00 2001
From: ssongliu <songlius11@163.com>
Date: Thu, 8 Dec 2022 11:56:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=20docker=20=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/docker.go                    | 16 +++++++---------
 .../src/views/container/compose/create/index.vue |  2 +-
 frontend/src/views/container/setting/index.vue   |  1 +
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/backend/app/service/docker.go b/backend/app/service/docker.go
index 29b9d5450..f6881add1 100644
--- a/backend/app/service/docker.go
+++ b/backend/app/service/docker.go
@@ -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"))
diff --git a/frontend/src/views/container/compose/create/index.vue b/frontend/src/views/container/compose/create/index.vue
index 9e2010920..ffaf7e910 100644
--- a/frontend/src/views/container/compose/create/index.vue
+++ b/frontend/src/views/container/compose/create/index.vue
@@ -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],
diff --git a/frontend/src/views/container/setting/index.vue b/frontend/src/views/container/setting/index.vue
index 256c438b0..dcfd2f9c4 100644
--- a/frontend/src/views/container/setting/index.vue
+++ b/frontend/src/views/container/setting/index.vue
@@ -176,6 +176,7 @@ const onOperator = async (operation: string) => {
         operation: operation,
     };
     await dockerOperate(param);
+    search();
     changeMode();
     ElMessage.success(i18n.global.t('commons.msg.operationSuccess'));
 };