Browse code

Do not populate path to prevent runconfig merge conflict; remove autoConfig seeding of entrypoint.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)

Erik Hollensbe authored on 2014/09/03 21:34:11
Showing 2 changed files
... ...
@@ -144,7 +144,7 @@ func (b *Builder) Run(context io.Reader) (string, error) {
144 144
 	b.dockerfile = ast
145 145
 
146 146
 	// some initializations that would not have been supplied by the caller.
147
-	b.Config = &runconfig.Config{Entrypoint: []string{}, Cmd: []string{"/bin/sh", "-c"}, Env: []string{"PATH=" + daemon.DefaultPathEnv}}
147
+	b.Config = &runconfig.Config{Entrypoint: []string{}, Cmd: []string{"/bin/sh", "-c"}}
148 148
 	b.TmpContainers = map[string]struct{}{}
149 149
 
150 150
 	for i, n := range b.dockerfile.Children {
... ...
@@ -90,10 +90,6 @@ func (b *Builder) commit(id string, autoCmd []string, comment string) error {
90 90
 	autoConfig := *b.Config
91 91
 	autoConfig.Cmd = autoCmd
92 92
 
93
-	if autoConfig.Entrypoint == nil {
94
-		autoConfig.Entrypoint = []string{"/bin/sh", "-c"}
95
-	}
96
-
97 93
 	// Commit the container
98 94
 	image, err := b.Daemon.Commit(container, "", "", "", b.maintainer, true, &autoConfig)
99 95
 	if err != nil {