kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-08 19:35:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added support to mount host folders into container. For example if you don't want to bake certificates into the container, you can mount them into the directory directly.

Browse Source 
Furthermore, I added support for volumes-from.

Currently, there is no support to move the data from one container to another, hence: If a container spawns on another host, it is very likely, that the data will not be found.
This commit is contained in:
Jan-Hendrik Lendholt
2016-09-20 11:22:27 +02:00
committed by Michael Schurter
parent 38b034d568
commit 7c077d2dae
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/driver/docker.go
View File

@@ -104,6 +104,8 @@ type DockerDriverConfig struct {
ShmSize int64 `mapstructure:"shm_size"` // Size of /dev/shm of the container in bytes
WorkDir string `mapstructure:"work_dir"` // Working directory inside the container
Logging []DockerLoggingOpts `mapstructure:"logging"` // Logging options for syslog server
Volumes []string `mapstructure:"volumes"` // Host-Volumes to mount in, syntax: /path/to/host/directory:/destination/path/in/container
VolumesFrom []string `mapstructure:"volumes_from"` // List of volumes-from
}
// Validate validates a docker driver config
@@ -127,6 +129,14 @@ func (c *DockerDriverConfig) Validate() error {
}
}
if c.Volumes == nil {
c.Volumes = make([]string, 0)
}
if c.VolumesFrom == nil {
c.VolumesFrom = make([]string, 0)
}
return nil
}
@@ -249,6 +259,12 @@ func (d *DockerDriver) Validate(config map[string]interface{}) error {
"logging": &fields.FieldSchema{
Type: fields.TypeArray,
},
"volumes": &fields.FieldSchema{
Type: fields.TypeArray,
},
"volumes_from": &fields.FieldSchema{
Type: fields.TypeArray,
},
},
}
@@ -439,6 +455,10 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task,
d.logger.Printf("[DEBUG] driver.docker: Using config for logging: %+v", driverConfig.Logging[0])
//Merge nomad container binds and user specified binds
d.logger.Printf("[DEBUG] Unmodified binds from nomad: %+v\n", binds)
binds = append(binds, driverConfig.Volumes...)
hostConfig := &docker.HostConfig{
// Convert MB to bytes. This is an absolute value.
Memory: memLimit,
@@ -449,7 +469,8 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task,
// Binds are used to mount a host volume into the container. We mount a
// local directory for storage and a shared alloc directory that can be
// used to share data between different tasks in the same task group.
Binds: binds,
Binds: binds,
VolumesFrom: driverConfig.VolumesFrom,
LogConfig: docker.LogConfig{
Type: driverConfig.Logging[0].Type,
Config: driverConfig.Logging[0].Config,
@@ -459,6 +480,7 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task,
d.logger.Printf("[DEBUG] driver.docker: using %d bytes memory for %s", hostConfig.Memory, task.Name)
d.logger.Printf("[DEBUG] driver.docker: using %d cpu shares for %s", hostConfig.CPUShares, task.Name)
d.logger.Printf("[DEBUG] driver.docker: binding directories %#v for %s", hostConfig.Binds, task.Name)
d.logger.Printf("[DEBUG] driver.docker: binding Volumes-From: %#v for %s", hostConfig.VolumesFrom, task.Name)
// set privileged mode
hostPrivileged := d.config.ReadBoolDefault("docker.privileged.enabled", false)