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

Making sure that there is only one port_map block in the docker driver config

Browse source
This commit is contained in:
Diptanu Choudhury 2015-11-15 02:58:46 -08:00 committed by Alex Dadgar
parent 0238e27d5d
commit 9d76572831
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
client/driver/docker.go
View file

@ -25,24 +25,30 @@ type DockerDriver struct {
}
type DockerDriverConfig struct {
ImageName string `mapstructure:"image"`
Command string `mapstructure:"command"`
Args string `mapstructure:"args"`
NetworkMode string `mapstructure:"network_mode"`
PortMap map[string]int `mapstructure:"port_map"`
UserName string `mapstructure:"auth.username"`
Password string `mapstructure:"auth.password`
Email string `mapstructure:"auth.email"`
ServerAddress string `mapstructure:"auth.server_address`
Privileged bool `mapstructure:"privileged"`
DNS string `mapstructure:"dns_server"`
SearchDomains string `mapstructure:"search_domains"`
ImageName string `mapstructure:"image"`
Command string `mapstructure:"command"`
Args string `mapstructure:"args"`
NetworkMode string `mapstructure:"network_mode"`
PortMap []map[string]int `mapstructure:"port_map"`
UserName string `mapstructure:"auth.username"`
Password string `mapstructure:"auth.password`
Email string `mapstructure:"auth.email"`
ServerAddress string `mapstructure:"auth.server_address`
Privileged bool `mapstructure:"privileged"`
DNS string `mapstructure:"dns_server"`
SearchDomains string `mapstructure:"search_domains"`
}
func (c *DockerDriverConfig) Validate() error {
if c.ImageName == "" {
return fmt.Errorf("Docker Driver needs an image name")
}
fmt.Printf("[DIPTANU] Portmap %#v \n", c.PortMap)
if len(c.PortMap) > 1 {
return fmt.Errorf("Only one port_map block is allowed in the docker driver config")
}
return nil
}
@ -274,7 +280,7 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task, dri
containerToHostPortMap := make(map[string]int)
for _, port := range network.DynamicPorts {
containerPort, ok := driverConfig.PortMap[port.Label]
containerPort, ok := driverConfig.PortMap[0][port.Label]
if !ok {
containerPort = port.Value
}