From 0788d96841e820f7af9cd00ad5aff8e9cc573a17 Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Thu, 2 Jan 2014 14:49:30 -0800 Subject: [PATCH 1/2] builder/docker: include user vars for docker configuration --- builder/docker/config.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builder/docker/config.go b/builder/docker/config.go index c7fb438e4..045bf19b8 100644 --- 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{ From 93f217c2f1ddcba4fad8930430fcc80c174438f2 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 2 Jan 2014 15:14:51 -0800 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 000586224..5d2539247 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## 0.5.2 (unreleased) +BUG FIXES: +* builders/docker: user variables work properly. [GH-777] ## 0.5.1 (01/02/2014)