diff --git a/agent/app/service/container.go b/agent/app/service/container.go index 097d5045d..3ca3877cd 100644 --- a/agent/app/service/container.go +++ b/agent/app/service/container.go @@ -510,7 +510,11 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error { global.LOG.Errorf("new task for create container failed, err: %v", err) return err } + + var wg sync.WaitGroup + wg.Add(1) go func() { + defer wg.Done() taskItem.AddSubTask(i18n.GetWithName("ContainerImagePull", req.Image), func(t *task.Task) error { if !checkImageExist(client, req.Image) || req.ForcePull { if err := pullImages(taskItem, client, req.Image); err != nil { @@ -562,6 +566,7 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error { global.LOG.Error(err.Error()) } }() + wg.Wait() return nil } diff --git a/agent/app/service/database_redis.go b/agent/app/service/database_redis.go index c9d44a042..af0b15b92 100644 --- a/agent/app/service/database_redis.go +++ b/agent/app/service/database_redis.go @@ -81,7 +81,7 @@ func (u *RedisService) CheckHasCli() bool { func (u *RedisService) InstallCli() error { item := dto.ContainerOperate{ Name: "1Panel-redis-cli-tools", - Image: "redis:7.2.4", + Image: "redis:7.4.4", Network: "1panel-network", } return NewIContainerService().ContainerCreate(item) diff --git a/frontend/src/views/database/redis/index.vue b/frontend/src/views/database/redis/index.vue index 523a290b5..0210a67c2 100644 --- a/frontend/src/views/database/redis/index.vue +++ b/frontend/src/views/database/redis/index.vue @@ -31,7 +31,13 @@