luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Renamed some things so it's more apparent that reserved and dynamic port mapping have very similar code

This commit is contained in:
Chris Bednarski 2015-11-17 21:34:07 -08:00
parent 8705ea07a4
commit 563e1aff56
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
client/driver/docker.go
View File

@ -256,42 +256,42 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task, dri
for _, port := range network.ReservedPorts { for _, port := range network.ReservedPorts {
hostPortStr := strconv.Itoa(port.Value) hostPortStr := strconv.Itoa(port.Value)
dockerPort := docker.Port(hostPortStr) containerPort := docker.Port(hostPortStr)
publishedPorts[dockerPort+"/tcp"] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: hostPortStr}} publishedPorts[containerPort+"/tcp"] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: hostPortStr}}
publishedPorts[dockerPort+"/udp"] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: hostPortStr}} publishedPorts[containerPort+"/udp"] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: hostPortStr}}
d.logger.Printf("[DEBUG] driver.docker: allocated port %s:%d -> %d (static)", network.IP, port.Value, port.Value) d.logger.Printf("[DEBUG] driver.docker: allocated port %s:%d -> %d (static)", network.IP, port.Value, port.Value)
exposedPorts[dockerPort+"/tcp"] = struct{}{} exposedPorts[containerPort+"/tcp"] = struct{}{}
exposedPorts[dockerPort+"/udp"] = struct{}{} exposedPorts[containerPort+"/udp"] = struct{}{}
d.logger.Printf("[DEBUG] driver.docker: exposed port %d", port.Value) d.logger.Printf("[DEBUG] driver.docker: exposed port %d", port.Value)
} }
containerToHostPortMap := make(map[string]int) containerToHostPortMap := make(map[string]int)
for _, port := range network.DynamicPorts { for _, port := range network.DynamicPorts {
// By default we will map the allocated port 1:1 to the container // By default we will map the allocated port 1:1 to the container
containerPort := port.Value containerPortInt := port.Value
// If the user has mapped a port using port_map we'll change it here // If the user has mapped a port using port_map we'll change it here
if len(driverConfig.PortMap) == 1 { if len(driverConfig.PortMap) == 1 {
mapped, ok := driverConfig.PortMap[0][port.Label] mapped, ok := driverConfig.PortMap[0][port.Label]
if ok { if ok {
containerPort = mapped containerPortInt = mapped
} }
} }
containerPortStr := docker.Port(strconv.Itoa(containerPort))
hostPortStr := strconv.Itoa(port.Value) hostPortStr := strconv.Itoa(port.Value)
containerPort := docker.Port(hostPortStr)
publishedPorts[containerPortStr+"/tcp"] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: hostPortStr}} publishedPorts[containerPort+"/tcp"] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: hostPortStr}}
publishedPorts[containerPortStr+"/udp"] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: hostPortStr}} publishedPorts[containerPort+"/udp"] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: hostPortStr}}
d.logger.Printf("[DEBUG] driver.docker: allocated port %s:%d -> %d (mapped)", network.IP, port.Value, containerPort) d.logger.Printf("[DEBUG] driver.docker: allocated port %s:%d -> %d (mapped)", network.IP, port.Value, containerPortInt)
exposedPorts[containerPortStr+"/tcp"] = struct{}{} exposedPorts[containerPort+"/tcp"] = struct{}{}
exposedPorts[containerPortStr+"/udp"] = struct{}{} exposedPorts[containerPort+"/udp"] = struct{}{}
d.logger.Printf("[DEBUG] driver.docker: exposed port %s", hostPortStr) d.logger.Printf("[DEBUG] driver.docker: exposed port %s", hostPortStr)
containerToHostPortMap[string(containerPortStr)] = port.Value containerToHostPortMap[string(containerPort)] = port.Value
} }
env.SetPorts(containerToHostPortMap) env.SetPorts(containerToHostPortMap)