mirror of
https://github.com/m1k1o/neko-rooms.git
synced 2026-11-03 07:01:35 -06:00
docker names fix minor bugs.
This commit is contained in:
@@ -150,7 +150,7 @@
|
||||
<v-simple-table>
|
||||
<template v-slot:default>
|
||||
<tbody>
|
||||
<tr v-for="({ host_path, container_path }, index) in settings.mounts" :key="index"><th style="width:50%;">{{ host_path }}</th><td>{{ container_path }}</td></tr>
|
||||
<tr v-for="({ host_path, container_path }, index) in settings.mounts" :key="index"><td style="width:50%;">{{ host_path }}</td><td>{{ container_path }}</td></tr>
|
||||
</tbody>
|
||||
</template>
|
||||
</v-simple-table>
|
||||
|
||||
@@ -85,7 +85,7 @@ func (manager *RoomManagerCtx) FindByName(name string) (*types.RoomEntry, error)
|
||||
}
|
||||
|
||||
func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, error) {
|
||||
if settings.Name != "" && dockerNames.RestrictedNamePattern.MatchString(settings.Name) {
|
||||
if settings.Name != "" && !dockerNames.RestrictedNamePattern.MatchString(settings.Name) {
|
||||
return "", fmt.Errorf("invalid container name, must match " + dockerNames.RestrictedNameChars)
|
||||
}
|
||||
|
||||
@@ -319,10 +319,19 @@ func (manager *RoomManagerCtx) GetSettings(id string) (*types.RoomSettings, erro
|
||||
return nil, err
|
||||
}
|
||||
|
||||
mounts := []types.RoomMount{}
|
||||
for _, mount := range container.Mounts {
|
||||
mounts = append(mounts, types.RoomMount{
|
||||
HostPath: mount.Source,
|
||||
ContainerPath: mount.Destination,
|
||||
})
|
||||
}
|
||||
|
||||
settings := types.RoomSettings{
|
||||
Name: roomName,
|
||||
NekoImage: nekoImage,
|
||||
MaxConnections: epr.Max - epr.Min + 1,
|
||||
Mounts: mounts,
|
||||
}
|
||||
|
||||
err = settings.FromEnv(container.Config.Env)
|
||||
|
||||
Reference in New Issue
Block a user