Skip to content

Commit

Permalink
Add hostname parameter to Docker driver
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosdp committed Nov 17, 2015
1 parent a17ce1e commit c5304c3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion client/driver/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ type DockerDriverConfig struct {
Privileged bool `mapstructure:"privileged"` // Flag to run the container in priviledged mode
DNS string `mapstructure:"dns_server"` // DNS Server for containers
SearchDomains string `mapstructure:"search_domains"` // DNS Search domains for containers
Hostname string `mapstructure:"hostname"` // Hostname for containers
}

func (c *DockerDriverConfig) Validate() error {
Expand Down Expand Up @@ -167,7 +168,8 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task, dri
env.SetTaskLocalDir(filepath.Join("/", allocdir.TaskLocal))

config := &docker.Config{
Image: driverConfig.ImageName,
Image: driverConfig.ImageName,
Hostname: driverConfig.Hostname,
}

hostConfig := &docker.HostConfig{
Expand Down
2 changes: 2 additions & 0 deletions website/source/docs/drivers/docker.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ The `docker` driver supports the following configuration in the job specificatio

* `search-domains` - (optional) A comma separated list of DNS search domains for the
container to use.

* `hostname` - (optional) The hostname to assign to the container.

**Authentication**
Registry authentication can be set per task with the following authentication
Expand Down

0 comments on commit c5304c3

Please sign in to comment.