flexible url if no traefik.

This commit is contained in:
Miroslav Šedivý
2022-07-31 18:57:56 +02:00
parent bb97bb75d2
commit 8046607742
2 changed files with 6 additions and 3 deletions
+6 -2
View File
@@ -29,7 +29,7 @@ func (manager *RoomManagerCtx) extractLabels(labels map[string]string) (*RoomLab
url, ok := labels["m1k1o.neko_rooms.url"]
if !ok {
return nil, fmt.Errorf("damaged container labels: url not found")
url = manager.config.GetRoomUrl(name)
}
nekoImage, ok := labels["m1k1o.neko_rooms.neko_image"]
@@ -90,13 +90,17 @@ func (manager *RoomManagerCtx) extractLabels(labels map[string]string) (*RoomLab
func (manager *RoomManagerCtx) serializeLabels(labels RoomLabels) map[string]string {
labelsMap := map[string]string{
"m1k1o.neko_rooms.name": labels.Name,
"m1k1o.neko_rooms.url": labels.URL,
"m1k1o.neko_rooms.instance": manager.config.InstanceName,
"m1k1o.neko_rooms.epr.min": fmt.Sprintf("%d", labels.Epr.Min),
"m1k1o.neko_rooms.epr.max": fmt.Sprintf("%d", labels.Epr.Max),
"m1k1o.neko_rooms.neko_image": labels.NekoImage,
}
// Only when using traefik is the URL fixed with the room itself and not with neko-rooms.
if manager.config.TraefikEnabled {
labelsMap["m1k1o.neko_rooms.url"] = manager.config.GetRoomUrl(labels.Name)
}
if labels.BrowserPolicy != nil {
labelsMap["m1k1o.neko_rooms.browser_policy"] = "true"
labelsMap["m1k1o.neko_rooms.browser_policy.type"] = string(labels.BrowserPolicy.Type)
-1
View File
@@ -170,7 +170,6 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
labels := manager.serializeLabels(RoomLabels{
Name: roomName,
URL: manager.config.GetRoomUrl(roomName),
Epr: epr,
NekoImage: settings.NekoImage,