diff --git a/agent/app/dto/database.go b/agent/app/dto/database.go index 4c99bc108..ff75e9cb7 100644 --- a/agent/app/dto/database.go +++ b/agent/app/dto/database.go @@ -58,7 +58,7 @@ type MysqlDBCreate struct { From string `json:"from" validate:"required,oneof=local remote"` Database string `json:"database" validate:"required"` Format string `json:"format" validate:"required,oneof=utf8mb4 utf8 gbk big5"` - Collation string `json:"collation" validate:"required"` + Collation string `json:"collation"` Username string `json:"username" validate:"required"` Password string `json:"password" validate:"required"` Permission string `json:"permission" validate:"required"` diff --git a/agent/app/model/database_mysql.go b/agent/app/model/database_mysql.go index 61299177f..412e09172 100644 --- a/agent/app/model/database_mysql.go +++ b/agent/app/model/database_mysql.go @@ -6,7 +6,7 @@ type DatabaseMysql struct { From string `json:"from" gorm:"not null;default:local"` MysqlName string `json:"mysqlName" gorm:"not null"` Format string `json:"format" gorm:"not null"` - Collation string `json:"collation" gorm:"not null"` + Collation string `json:"collation"` Username string `json:"username" gorm:"not null"` Password string `json:"password" gorm:"not null"` Permission string `json:"permission" gorm:"not null"` diff --git a/agent/app/service/container_network.go b/agent/app/service/container_network.go index ef5ac9c83..2c07225f8 100644 --- a/agent/app/service/container_network.go +++ b/agent/app/service/container_network.go @@ -117,10 +117,8 @@ func (u *ContainerService) CreateNetwork(req dto.NetworkCreate) error { return err } defer client.Close() - var ( - ipams []network.IPAMConfig - enableV6 bool - ) + var ipams []network.IPAMConfig + if req.Ipv4 { var itemIpam network.IPAMConfig if len(req.AuxAddress) != 0 { @@ -141,7 +139,6 @@ func (u *ContainerService) CreateNetwork(req dto.NetworkCreate) error { ipams = append(ipams, itemIpam) } if req.Ipv6 { - enableV6 = true var itemIpam network.IPAMConfig if len(req.AuxAddress) != 0 { itemIpam.AuxAddress = make(map[string]string) @@ -162,7 +159,7 @@ func (u *ContainerService) CreateNetwork(req dto.NetworkCreate) error { } options := network.CreateOptions{ - EnableIPv6: &enableV6, + EnableIPv6: &req.Ipv6, Driver: req.Driver, Options: stringsToMap(req.Options), Labels: stringsToMap(req.Labels), diff --git a/agent/init/migration/migrations/init.go b/agent/init/migration/migrations/init.go index 8847a0f38..124255efe 100644 --- a/agent/init/migration/migrations/init.go +++ b/agent/init/migration/migrations/init.go @@ -728,7 +728,7 @@ var AddGPUMonitor = &gormigrate.Migration{ } var UpdateDatabaseMysql = &gormigrate.Migration{ - ID: "20251124-update-database-mysql", + ID: "20251125-update-database-mysql", Migrate: func(tx *gorm.DB) error { return tx.AutoMigrate(&model.Database{}) }, diff --git a/frontend/src/views/container/container/inspect/index.vue b/frontend/src/views/container/container/inspect/index.vue index b0b62be13..4da5765b2 100644 --- a/frontend/src/views/container/container/inspect/index.vue +++ b/frontend/src/views/container/container/inspect/index.vue @@ -192,10 +192,6 @@ const acceptParams = (props: DialogProps): void => { inspectData.value = props.data; } rawJson.value = JSON.stringify(inspectData.value, null, 2); - - if (!ports.value.length) { - ports.value = Object.keys(inspectData.value?.Config?.ExposedPorts || {}); - } } catch (e) { console.error('Failed to parse inspect data:', e); }