Allow skip ingress network

README.md

@@ -54,6 +54,9 @@ Usage of /bin/registrator:
   -tags="": Append tags for all registered services
   -ttl=0: TTL for services (default is no expiry)
   -ttl-refresh=0: Frequency with which service TTLs are refreshed
+  -swarm-manager-servicename="": Register swarm manager service when non-empty
+  -swarm-replicas-aware=true: Remove registered swarm services without replicas (default true)
+  -swarm-skip-internal-ingress=false: Skip ingress network for internal mode
 ```
 
 ## Contributing

bridge/bridge.go

@@ -372,7 +372,20 @@ func (b *Bridge) newService(port ServicePort, isgroup bool) []*Service {
 		var p int
 
 		if b.config.Internal == true {
-			service.IP = port.ExposedIP
+			exists := false
+			if b.config.SwarmSkipIntIngress {
+				for name, network := range container.NetworkSettings.Networks {
+					if name != "ingress" {
+						exists = true
+						service.IP = network.IPAddress
+						log.Printf("service %s will use network %s", service.Name, name)
+						break
+					}
+				}
+			}
+			if !exists {
+				service.IP = port.ExposedIP
+			}
 			p, _ = strconv.Atoi(port.ExposedPort)
 		} else {
 			service.IP = port.HostIP

bridge/types.go

@@ -32,6 +32,7 @@ type Config struct {
 	Cleanup             bool
 	SwarmReplicasAware  bool
 	SwarmManagerSvcName string
+	SwarmSkipIntIngress bool
 }
 
 type Service struct {

registrator.go

@@ -35,6 +35,7 @@ var retryInterval = flag.Int("retry-interval", 2000, "Interval (in millisecond)
 var cleanup = flag.Bool("cleanup", false, "Remove dangling services")
 var swarmReplicasAware = flag.Bool("swarm-replicas-aware", true, "Remove registered swarm services without replicas")
 var swarmManagerSvcName = flag.String("swarm-manager-servicename", "", "Register swarm manager service when non-empty")
+var swarmSkipIntIngress = flag.Bool("swarm-skip-internal-ingress", false, "Skip ingress network for internal mode")
 
 func getopt(name, def string) string {
 	if env := os.Getenv(name); env != "" {
@@ -155,6 +156,7 @@ func main() {
 		Cleanup:             *cleanup,
 		SwarmReplicasAware:  *swarmReplicasAware,
 		SwarmManagerSvcName: *swarmManagerSvcName,
+		SwarmSkipIntIngress: *swarmSkipIntIngress,
 	})
 
 	assert(err)