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

Merge pull request #777 from mitchellh/docker-user-vars 

builder/docker: include user vars for docker configuration
This commit is contained in:
Mitchell Hashimoto 2014-01-02 15:14:15 -08:00
parent 04f14161f5 0788d96841
commit 173f63a336
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/docker/config.go
View File

@ -29,6 +29,8 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
return nil, nil, err return nil, nil, err
} }
c.tpl.UserVars = c.PackerUserVars
// Defaults // Defaults
if len(c.RunCommand) == 0 { if len(c.RunCommand) == 0 {
c.RunCommand = []string{ c.RunCommand = []string{