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

WORKDIR set cmd

Browse Source 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1b97bb416b8e2d4cd77544a1d714026b25d73c2f
Component: engine
This commit is contained in:
John Howard
2016-11-28 15:44:10 -08:00
parent 312027d8f9
commit 4c2dcd5ab3
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/engine/builder/dockerfile/dispatchers.go
View File

@ -290,6 +290,17 @@ func workdir(b *Builder, args []string, attributes map[string]bool, original str
return nil
}
b.runConfig.Image = b.image
cmd := b.runConfig.Cmd
b.runConfig.Cmd = strslice.StrSlice(append(getShell(b.runConfig), fmt.Sprintf("#(nop) WORKDIR %s", b.runConfig.WorkingDir)))
defer func(cmd strslice.StrSlice) { b.runConfig.Cmd = cmd }(cmd)
if hit, err := b.probeCache(); err != nil {
return err
} else if hit {
return nil
}
container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{Config: b.runConfig}, true)
if err != nil {
return err