traefik port in config.

This commit is contained in:
m1k1o
2021-03-10 01:22:18 +01:00
parent e5c20c2f26
commit d1c286264d
4 changed files with 17 additions and 5 deletions
+1 -2
View File
@@ -1,10 +1,9 @@
APP_PORT=8080
NEKO_ROOMS_EPR=59000-59049
NEKO_ROOMS_NAT1TO1=192.168.1.20
NEKO_ROOMS_TRAEFIK_DOMAIN=neko-rooms.server.lan
NEKO_ROOMS_TRAEFIK_ENTRYPOINT=web
NEKO_ROOMS_TRAEFIK_NETWORK=neko-rooms-traefik
NEKO_ROOMS_TRAEFIK_PORT=8080
TZ=Europe/Vienna
+3 -2
View File
@@ -15,9 +15,9 @@ services:
- "--providers.docker.watch=true"
- "--providers.docker.exposedbydefault=false"
- "--providers.docker.network=${NEKO_ROOMS_TRAEFIK_NETWORK}"
- "--entrypoints.${NEKO_ROOMS_TRAEFIK_ENTRYPOINT}.address=:${APP_PORT}"
- "--entrypoints.${NEKO_ROOMS_TRAEFIK_ENTRYPOINT}.address=:${NEKO_ROOMS_TRAEFIK_PORT}"
ports:
- "${APP_PORT}:${APP_PORT}"
- "${NEKO_ROOMS_TRAEFIK_PORT}:${NEKO_ROOMS_TRAEFIK_PORT}"
volumes:
- "/var/run/docker.sock:/var/run/docker.sock:ro"
@@ -30,6 +30,7 @@ services:
- "NEKO_ROOMS_TRAEFIK_DOMAIN"
- "NEKO_ROOMS_TRAEFIK_ENTRYPOINT"
- "NEKO_ROOMS_TRAEFIK_NETWORK"
- "NEKO_ROOMS_TRAEFIK_PORT"
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
labels:
+7
View File
@@ -22,6 +22,7 @@ type Room struct {
TraefikEntrypoint string
TraefikCertresolver string
TraefikNetwork string
TraefikPort string
}
func (Room) Init(cmd *cobra.Command) error {
@@ -65,6 +66,11 @@ func (Room) Init(cmd *cobra.Command) error {
return err
}
cmd.PersistentFlags().String("traefik_port", "", "traefik: external port (if different than 80 or 443)")
if err := viper.BindPFlag("traefik_port", cmd.PersistentFlags().Lookup("traefik_port")); err != nil {
return err
}
return nil
}
@@ -110,4 +116,5 @@ func (s *Room) Set() {
s.TraefikEntrypoint = viper.GetString("traefik_entrypoint")
s.TraefikCertresolver = viper.GetString("traefik_certresolver")
s.TraefikNetwork = viper.GetString("traefik_network")
s.TraefikPort = viper.GetString("traefik_port")
}
+6 -1
View File
@@ -106,10 +106,15 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
urlProto = "https"
}
port := ""
if manager.config.TraefikPort != "" {
port = ":" + manager.config.TraefikPort
}
labels := map[string]string{
// Set internal labels
"m1k1o.neko_rooms.name": roomName,
"m1k1o.neko_rooms.url": urlProto + "://" + manager.config.TraefikDomain + "/" + roomName + "/",
"m1k1o.neko_rooms.url": urlProto + "://" + manager.config.TraefikDomain + port + "/" + roomName + "/",
"m1k1o.neko_rooms.instance": manager.config.InstanceName,
"m1k1o.neko_rooms.epr.min": fmt.Sprintf("%d", epr.Min),
"m1k1o.neko_rooms.epr.max": fmt.Sprintf("%d", epr.Max),