docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3202 from jpoimboe/libvirt-prereq-env 

dockerinit: propagate "container" env variable from lxc
This commit is contained in:
Victor Vieux 2013-12-13 10:32:17 -08:00
parent 0ef1ff91cb e877294321
commit 5d81776714
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
container.go
View File

@ -586,7 +586,6 @@ func (container *Container) Start() (err error) {
env := []string{ env := []string{
"HOME=/", "HOME=/",
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
"container=lxc",
"HOSTNAME=" + container.Config.Hostname, "HOSTNAME=" + container.Config.Hostname,
} }

3
sysinit/sysinit.go
View File

@ -191,6 +191,9 @@ func SysInit() {
log.Fatalf("Unable to unmarshal environment variables: %v", err) log.Fatalf("Unable to unmarshal environment variables: %v", err)
} }
// Propagate the plugin-specific container env variable
env = append(env, "container="+os.Getenv("container"))
args := &DockerInitArgs{ args := &DockerInitArgs{
user: *user, user: *user,
gateway: *gateway, gateway: *gateway,