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

Merge pull request #1157 from kstaken/1156-entrypoint-builder 

Builder: Fix #1156 entrypoint override from base image
This commit is contained in:
Guillaume J. Charmes 2013-07-08 16:57:26 -07:00
parent 90f372af5c 87a69e6753
commit e14dd4d33e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildfile.go
View File

@ -282,6 +282,10 @@ func (b *buildFile) run() (string, error) {
b.lastContainer = c b.lastContainer = c
fmt.Fprintf(b.out, " ---> Running in %s\n", utils.TruncateID(c.ID)) fmt.Fprintf(b.out, " ---> Running in %s\n", utils.TruncateID(c.ID))
// override the entry point that may have been picked up from the base image
c.Path = b.config.Cmd[0]
c.Args = b.config.Cmd[1:]
//start the container //start the container
hostConfig := &HostConfig{} hostConfig := &HostConfig{}
if err := c.Start(hostConfig); err != nil { if err := c.Start(hostConfig); err != nil {