iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7091 from arizvisa/GH-6920 

Proper fix to #6920 which ensures that entrypoint and arguments get passed to docker, not the image.
This commit is contained in:
Megan Marsh 2018-12-10 13:25:34 -08:00 committed by GitHub
parent 32f226eda0 a6af04417e
commit d367c1ba8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/docker/config.go
View File

@ -73,7 +73,7 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
// Defaults // Defaults
if len(c.RunCommand) == 0 { if len(c.RunCommand) == 0 {
c.RunCommand = []string{"-d", "-i", "-t", "{{.Image}}", "--entrypoint=/bin/sh"} c.RunCommand = []string{"-d", "-i", "-t", "--entrypoint=/bin/sh", "--", "{{.Image}}"}
} }
// Default Pull if it wasn't set // Default Pull if it wasn't set