upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-02-28 20:41:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #7091 from arizvisa/GH-6920

Browse source 
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
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
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