Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
| ... | ... |
@@ -110,7 +110,7 @@ func (b *buildFile) CmdFrom(name string) error {
|
| 110 | 110 |
b.config = image.Config |
| 111 | 111 |
} |
| 112 | 112 |
if b.config.Env == nil || len(b.config.Env) == 0 {
|
| 113 |
- b.config.Env = append(b.config.Env, "HOME=/", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") |
|
| 113 |
+ b.config.Env = append(b.config.Env, "HOME=/", "PATH="+defaultPathEnv) |
|
| 114 | 114 |
} |
| 115 | 115 |
// Process ONBUILD triggers if they exist |
| 116 | 116 |
if nTriggers := len(b.config.OnBuild); nTriggers != 0 {
|
| ... | ... |
@@ -23,6 +23,8 @@ import ( |
| 23 | 23 |
"time" |
| 24 | 24 |
) |
| 25 | 25 |
|
| 26 |
+const defaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" |
|
| 27 |
+ |
|
| 26 | 28 |
var ( |
| 27 | 29 |
ErrNotATTY = errors.New("The PTY is not a file")
|
| 28 | 30 |
ErrNoTTY = errors.New("No PTY found")
|
| ... | ... |
@@ -447,7 +449,7 @@ func (container *Container) Start() (err error) {
|
| 447 | 447 |
// Setup environment |
| 448 | 448 |
env := []string{
|
| 449 | 449 |
"HOME=/", |
| 450 |
- "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", |
|
| 450 |
+ "PATH=" + defaultPathEnv, |
|
| 451 | 451 |
"HOSTNAME=" + container.Config.Hostname, |
| 452 | 452 |
} |
| 453 | 453 |
|
| ... | ... |
@@ -72,7 +72,7 @@ func (l *Link) ToEnv() []string {
|
| 72 | 72 |
if len(parts) != 2 {
|
| 73 | 73 |
continue |
| 74 | 74 |
} |
| 75 |
- // Ignore a few variables that are added during docker build |
|
| 75 |
+ // Ignore a few variables that are added during docker build (and not really relevant to linked containers) |
|
| 76 | 76 |
if parts[0] == "HOME" || parts[0] == "PATH" {
|
| 77 | 77 |
continue |
| 78 | 78 |
} |