mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Fix issue with CMD instruction within docker build
This commit is contained in:
parent
a4e6025cc1
commit
6d2e3d2ec0
1 changed files with 10 additions and 2 deletions
12
buildfile.go
12
buildfile.go
|
@ -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) {
|
||||
|
|
Loading…
Add table
Reference in a new issue