Merge pull request #426 from carlosdp/hostname-docker

Add hostname parameter to Docker driver
This commit is contained in:
Alex Dadgar 2015-11-17 10:46:42 -08:00
commit 365a3998ba
2 changed files with 7 additions and 1 deletions

View File

@ -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 {
@ -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{

View File

@ -43,6 +43,10 @@ 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. When launching more
than one of a task (using `count`) with this option set, every container the task
starts will have the same hostname.
**Authentication**
Registry authentication can be set per task with the following authentication
parameters. These options can provide access to private repositories that