mirror of
https://github.com/m1k1o/neko-rooms.git
synced 2026-11-02 22:51:34 -06:00
fix container by name.
This commit is contained in:
@@ -82,7 +82,7 @@ func (manager *RoomManagerCtx) containerById(ctx context.Context, id string) (*d
|
|||||||
|
|
||||||
func (manager *RoomManagerCtx) containerByName(ctx context.Context, name string) (*dockerTypes.Container, error) {
|
func (manager *RoomManagerCtx) containerByName(ctx context.Context, name string) (*dockerTypes.Container, error) {
|
||||||
return manager.containerFilter(ctx, filters.NewArgs(
|
return manager.containerFilter(ctx, filters.NewArgs(
|
||||||
filters.Arg("name", manager.config.InstanceName+"-"+name),
|
filters.Arg("label", fmt.Sprintf("m1k1o.neko_rooms.name=%s", name)),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -712,18 +712,7 @@ func (manager *RoomManagerCtx) GetEntryByName(ctx context.Context, name string)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
roomEntry, err := manager.containerToEntry(*container)
|
return manager.containerToEntry(*container)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// we can match containers starting with given name
|
|
||||||
// but we want to match only exact name
|
|
||||||
if roomEntry.Name != name {
|
|
||||||
return nil, types.ErrRoomNotFound
|
|
||||||
}
|
|
||||||
|
|
||||||
return roomEntry, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (manager *RoomManagerCtx) Remove(ctx context.Context, id string) error {
|
func (manager *RoomManagerCtx) Remove(ctx context.Context, id string) error {
|
||||||
|
|||||||
Reference in New Issue
Block a user