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

Merge branch 'master' of https://github.com/mitchellh/packer into docker-metadata

This commit is contained in:
Matthew McKeen 2014-01-03 18:03:39 -08:00
parent d6621bb023 93f217c2f1
commit b53dd2e0bd
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,6 +1,8 @@
## 0.5.2 (unreleased) ## 0.5.2 (unreleased)
BUG FIXES:
* builders/docker: user variables work properly. [GH-777]
## 0.5.1 (01/02/2014) ## 0.5.1 (01/02/2014)

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{