1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-09-20 07:35:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 解决应用同步异常的问题 (#3991)

Browse source
This commit is contained in:
zhengkunwang 2024-02-27 11:28:12 +08:00 committed by GitHub
parent a0af04bbf7
commit 279b3942b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -39,6 +39,8 @@ frontend/auto-imports.d.ts
frontend/components.d.ts
frontend/src/xpack
backend/xpack
backend/router/entry_xpack.go
backend/server/init_xpack.go
.history/
dist/

2
backend/app/service/app_install.go
View file

@ -701,7 +701,7 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
}
func syncAppInstallStatus(appInstall *model.AppInstall) error {
if appInstall.Status == constant.Installing || appInstall.Status == constant.Rebuilding {
if appInstall.Status == constant.Installing || appInstall.Status == constant.Rebuilding || appInstall.Status == constant.Upgrading {
return nil
}
containerNames, err := getContainerNames(*appInstall)

12
backend/utils/docker/docker.go
View file

@ -48,12 +48,15 @@ func NewDockerClient() (*client.Client, error) {
func (c Client) ListContainersByName(names []string) ([]types.Container, error) {
var (
options container.ListOptions
options container.ListOptions
namesMap = make(map[string]bool)
res []types.Container
)
options.All = true
if len(names) > 0 {
var array []filters.KeyValuePair
for _, n := range names {
namesMap["/"+n] = true
array = append(array, filters.Arg("name", n))
}
options.Filters = filters.NewArgs(array...)
@ -62,7 +65,12 @@ func (c Client) ListContainersByName(names []string) ([]types.Container, error)
if err != nil {
return nil, err
}
return containers, nil
for _, con := range containers {
if _, ok := namesMap[con.Names[0]]; ok {
res = append(res, con)
}
}
return res, nil
}
func (c Client) CreateNetwork(name string) error {