Skip to content

Commit ce86e8c

Browse files
authored
fix: Remote Redis connection (#8881)
1 parent 36b81f6 commit ce86e8c

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

agent/app/service/container.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,11 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error {
510510
global.LOG.Errorf("new task for create container failed, err: %v", err)
511511
return err
512512
}
513+
514+
var wg sync.WaitGroup
515+
wg.Add(1)
513516
go func() {
517+
defer wg.Done()
514518
taskItem.AddSubTask(i18n.GetWithName("ContainerImagePull", req.Image), func(t *task.Task) error {
515519
if !checkImageExist(client, req.Image) || req.ForcePull {
516520
if err := pullImages(taskItem, client, req.Image); err != nil {
@@ -562,6 +566,7 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error {
562566
global.LOG.Error(err.Error())
563567
}
564568
}()
569+
wg.Wait()
565570
return nil
566571
}
567572

agent/app/service/database_redis.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func (u *RedisService) CheckHasCli() bool {
8181
func (u *RedisService) InstallCli() error {
8282
item := dto.ContainerOperate{
8383
Name: "1Panel-redis-cli-tools",
84-
Image: "redis:7.2.4",
84+
Image: "redis:7.4.4",
8585
Network: "1panel-network",
8686
}
8787
return NewIContainerService().ContainerCreate(item)

frontend/src/views/database/redis/index.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,13 @@
3131
</el-button>
3232
</template>
3333
<template #rightToolBar v-if="!isOnSetting">
34-
<el-select v-model="currentDBName" @change="changeDatabase()" class="p-w-200 ml-5" v-if="currentDB">
34+
<el-select
35+
v-model="currentDBName"
36+
@change="changeDatabase()"
37+
class="p-w-200 ml-5"
38+
v-if="currentDB"
39+
placement="bottom-end"
40+
>
3541
<template #prefix>{{ $t('commons.table.type') }}</template>
3642
<el-option-group :label="$t('commons.table.local')">
3743
<div v-for="(item, index) in dbOptionsLocal" :key="index">

frontend/src/views/database/redis/remote/operate/index.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<el-radio-group v-model="dialogData.rowData!.version" @change="isOK = false">
1616
<el-radio label="6.x" value="6.x" />
1717
<el-radio label="7.x" value="7.x" />
18+
<el-radio label="8.x" value="8.x" />
1819
</el-radio-group>
1920
</el-form-item>
2021
<el-form-item :label="$t('database.address')" prop="address">
@@ -80,6 +81,9 @@ const acceptParams = (params: DialogProps): void => {
8081
if (dialogData.value.rowData.version.startsWith('7.')) {
8182
dialogData.value.rowData.version = '7.x';
8283
}
84+
if (dialogData.value.rowData.version.startsWith('8.')) {
85+
dialogData.value.rowData.version = '8.x';
86+
}
8387
title.value = i18n.global.t('database.' + dialogData.value.title + 'RemoteDB');
8488
drawerVisible.value = true;
8589
};

0 commit comments

Comments
 (0)