Supply hostname and domain to driver when creating endpoint

Mainly as a (vast) convenience.
squaremo · Jun 2, 2015 · 8014c31 · 8014c31
1 parent 4410e02
commit 8014c31
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/daemon/container_linux.go b/daemon/container_linux.go
@@ -637,6 +637,8 @@ func (container *Container) buildCreateEndpointOptions() ([]libnetwork.EndpointO
 	var (
 		portSpecs     = make(nat.PortSet)
 		bindings      = make(nat.PortMap)
+		hostname      = container.Config.Hostname
+		domainname    = container.Config.Domainname
 		pbList        []types.PortBinding
 		exposeList    []types.TransportPort
 		createOptions []libnetwork.EndpointOption
@@ -714,6 +716,11 @@ func (container *Container) buildCreateEndpointOptions() ([]libnetwork.EndpointO
 		createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(genericOption))
 	}
 
+	createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(options.Generic{
+		"io.docker.network.hostname":   hostname,
+		"io.docker.network.domainname": domainname,
+	}))
+
 	return createOptions, nil
 }