diff --git a/agent/app/service/docker.go b/agent/app/service/docker.go index d101d1cb5..865b24ed7 100644 --- a/agent/app/service/docker.go +++ b/agent/app/service/docker.go @@ -8,6 +8,7 @@ import ( "os" "path" "strings" + "time" "github.com/1Panel-dev/1Panel/agent/app/dto" "github.com/1Panel-dev/1Panel/agent/constant" @@ -457,7 +458,7 @@ func restartDocker() error { if err != nil { return err } - stdout, err := cmd.RunDefaultWithStdoutBashCf("%s restart docker", restartCmd) + stdout, err := cmd.NewCommandMgr(cmd.WithTimeout(3*time.Minute)).RunWithStdoutBashCf("%s restart docker", restartCmd) if err != nil { return fmt.Errorf("failed to restart Docker: %s", stdout) } diff --git a/frontend/src/api/modules/container.ts b/frontend/src/api/modules/container.ts index 6edd74f74..1ebf9f67a 100644 --- a/frontend/src/api/modules/container.ts +++ b/frontend/src/api/modules/container.ts @@ -185,7 +185,7 @@ export const composeUpdate = (params: Container.ComposeUpdate) => { // docker export const dockerOperate = (operation: string) => { - return http.post(`/containers/docker/operate`, { operation: operation }); + return http.post(`/containers/docker/operate`, { operation: operation }, TimeoutEnum.T_3M); }; export const loadDaemonJson = () => { return http.get(`/containers/daemonjson`); @@ -197,18 +197,18 @@ export const loadDockerStatus = () => { return http.get(`/containers/docker/status`); }; export const updateDaemonJson = (key: string, value: string) => { - return http.post(`/containers/daemonjson/update`, { key: key, value: value }, TimeoutEnum.T_60S); + return http.post(`/containers/daemonjson/update`, { key: key, value: value }, TimeoutEnum.T_3M); }; export const updateLogOption = (maxSize: string, maxFile: string) => { - return http.post(`/containers/logoption/update`, { logMaxSize: maxSize, logMaxFile: maxFile }, TimeoutEnum.T_60S); + return http.post(`/containers/logoption/update`, { logMaxSize: maxSize, logMaxFile: maxFile }, TimeoutEnum.T_3M); }; export const updateIpv6Option = (fixedCidrV6: string, ip6Tables: boolean, experimental: boolean) => { return http.post( `/containers/ipv6option/update`, { fixedCidrV6: fixedCidrV6, ip6Tables: ip6Tables, experimental: experimental }, - TimeoutEnum.T_60S, + TimeoutEnum.T_3M, ); }; export const updateDaemonJsonByfile = (params: Container.DaemonJsonUpdateByFile) => { - return http.post(`/containers/daemonjson/update/byfile`, params); + return http.post(`/containers/daemonjson/update/byfile`, params, TimeoutEnum.T_3M); }; diff --git a/frontend/src/enums/http-enum.ts b/frontend/src/enums/http-enum.ts index eb72726de..d3ea6cb15 100644 --- a/frontend/src/enums/http-enum.ts +++ b/frontend/src/enums/http-enum.ts @@ -20,6 +20,7 @@ export enum ResultEnum { export enum TimeoutEnum { T_40S = 40000, T_60S = 60000, + T_3M = 180000, T_5M = 300000, T_10M = 600000, T_1H = 3600000,