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

b53dd2e0 · Matthew McKeen · d6621bb0 · 93f217c2 · b53dd2e0 · b53dd2e0
Commit b53dd2e0 authored Jan 03, 2014 by Matthew McKeen
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

CHANGELOG.md CHANGELOG.md +2 -0

builder/docker/config.go builder/docker/config.go +2 -0

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
 ## 0.5.2 (unreleased)

+BUG FIXES:

+* builders/docker: user variables work properly. [GH-777]

 ## 0.5.1 (01/02/2014)


--- a/builder/docker/config.go
+++ b/builder/docker/config.go
@@ -29,6 +29,8 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
 		return nil, nil, err
 	}

+	c.tpl.UserVars = c.PackerUserVars
+
 	// Defaults
 	if len(c.RunCommand) == 0 {
 		c.RunCommand = []string{