gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 14:08:06 +08:00
Code

fix: 修改构建失败判断条件 (#380)

Browse Source
This commit is contained in:
ssongliu 2023-03-23 16:24:36 +08:00 committed by GitHub
parent 5d1fced8e9
commit 92a410fcea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/app/service/container.go
View File

@ -3,6 +3,7 @@ package service
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os/exec" "os/exec"
@ -239,7 +240,7 @@ func (u *ContainerService) ContainerLogs(req dto.ContainerLog) (string, error) {
} }
stdout, err := cmd.CombinedOutput() stdout, err := cmd.CombinedOutput()
if err != nil { if err != nil {
return "", err return "", errors.New(string(stdout))
} }
return string(stdout), nil return string(stdout), nil
} }

2
backend/app/service/image.go
View File

@ -181,7 +181,7 @@ func (u *ImageService) ImageBuild(req dto.ImageBuild) (string, error) {
return return
} }
if strings.Contains(string(body), "error") && strings.Contains(string(body), "failed:") { if strings.Contains(string(body), "errorDetail") || strings.Contains(string(body), "error:") {
global.LOG.Errorf("build image %s failed", req.Name) global.LOG.Errorf("build image %s failed", req.Name)
_, _ = file.Write(body) _, _ = file.Write(body)
_, _ = file.WriteString("image build failed!") _, _ = file.WriteString("image build failed!")

2
frontend/src/api/modules/container.ts
View File

@ -9,7 +9,7 @@ export const createContainer = (params: Container.ContainerCreate) => {
return http.post(`/containers`, params, 1200000); return http.post(`/containers`, params, 1200000);
}; };
export const logContainer = (params: Container.ContainerLogSearch) => { export const logContainer = (params: Container.ContainerLogSearch) => {
return http.post<string>(`/containers/search/log`, params); return http.post<string>(`/containers/search/log`, params, 400000);
}; };
export const ContainerStats = (id: string) => { export const ContainerStats = (id: string) => {
return http.get<Container.ContainerStats>(`/containers/stats/${id}`); return http.get<Container.ContainerStats>(`/containers/stats/${id}`);