toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with CMD instruction within docker build

Browse Source 
Upstream-commit: 6d2e3d2ec0dedc6c1429e87800e9f3d7e4ada095
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-05-30 12:21:57 -07:00
parent 79331052da
commit 736941c2f5
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/engine/buildfile.go
View File

@ -143,7 +143,11 @@ func (b *buildFile) CmdCmd(args string) error {
utils.Debugf("Error unmarshalling: %s, using /bin/sh -c", err)
cmd = []string{"/bin/sh", "-c", args}
}
return b.commit("", cmd, fmt.Sprintf("CMD %v", cmd))
if err := b.commit("", cmd, fmt.Sprintf("CMD %v", cmd)); err != nil {
return err
}
b.config.Cmd = cmd
return nil
}
func (b *buildFile) CmdExpose(args string) error {
@ -216,7 +220,11 @@ func (b *buildFile) CmdAdd(args string) error {
return err
}
}
return b.commit(cid, cmd, fmt.Sprintf("ADD %s in %s", orig, dest))
if err := b.commit(cid, cmd, fmt.Sprintf("ADD %s in %s", orig, dest)); err != nil {
return err
}
b.config.Cmd = cmd
return nil
}
func (b *buildFile) run() (string, error) {