Merge pull request #427 from lucaslorentz/compare_network_names

Compare network name as well to support podman

Author: lucaslorentz

generator/generator.go

@@ -244,6 +244,7 @@ func (g *CaddyfileGenerator) getIngressNetworks(logger *zap.Logger) (map[string]
 				for _, ingressNetwork := range g.options.IngressNetworks {
 					if dockerNetwork.Name == ingressNetwork {
 						ingressNetworks[dockerNetwork.ID] = true
+						ingressNetworks[dockerNetwork.Name] = true
 					}
 				}
 			}
@@ -266,7 +267,8 @@ func (g *CaddyfileGenerator) getIngressNetworks(logger *zap.Logger) (map[string]
 				if networkInfo.Ingress {
 					continue
 				}
-				ingressNetworks[network.NetworkID] = true
+				ingressNetworks[networkInfo.ID] = true
+				ingressNetworks[networkInfo.Name] = true
 			}
 		}
 	}

generator/generator_test.go

@@ -20,11 +20,12 @@ import (
 
 var caddyContainerID = "container-id"
 var caddyNetworkID = "network-id"
+var caddyNetworkName = "network-name"
 
 const newLine = "\n"
 const containerIdLog = `INFO	Caddy ContainerID	{"ID": "container-id"}` + newLine
-const ingressNetworksMapLog = `INFO	IngressNetworksMap	{"ingres": "map[network-id:true]"}` + newLine
-const otherIngressNetworksMapLog = `INFO	IngressNetworksMap	{"ingres": "map[other-network-id:true]"}` + newLine
+const ingressNetworksMapLog = `INFO	IngressNetworksMap	{"ingres": "map[network-id:true network-name:true]"}` + newLine
+const otherIngressNetworksMapLog = `INFO	IngressNetworksMap	{"ingres": "map[other-network-id:true other-network-name:true]"}` + newLine
 const swarmIsAvailableLog = `INFO	Swarm is available	{"new": true}` + newLine
 const swarmIsDisabledLog = `INFO	Swarm is available	{"new": false}` + newLine
 const commonLogs = containerIdLog + ingressNetworksMapLog + swarmIsAvailableLog
@@ -183,6 +184,8 @@ func createBasicDockerClientMock() *docker.ClientMock {
 		NetworkInspectData: map[string]types.NetworkResource{
 			caddyNetworkID: {
 				Ingress: false,
+				ID:      caddyNetworkID,
+				Name:    caddyNetworkName,
 			},
 		},
 	}