From 4cae87645f66f90d4d4a6522d41a04e4d0c2e973 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 27 May 2015 13:03:47 -0700 Subject: [PATCH] builder/docker: fix issue where docker might get nil interp context --- builder/docker/builder.go | 2 +- builder/docker/config.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/docker/builder.go b/builder/docker/builder.go index a94177070..2dddbf94e 100644 --- a/builder/docker/builder.go +++ b/builder/docker/builder.go @@ -26,7 +26,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { } func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { - driver := &DockerDriver{Ctx: b.config.ctx, Ui: ui} + driver := &DockerDriver{Ctx: &b.config.ctx, Ui: ui} if err := driver.Verify(); err != nil { return nil, err } diff --git a/builder/docker/config.go b/builder/docker/config.go index dd525497e..e261068df 100644 --- a/builder/docker/config.go +++ b/builder/docker/config.go @@ -26,7 +26,7 @@ type Config struct { LoginPassword string `mapstructure:"login_password"` LoginServer string `mapstructure:"login_server"` - ctx *interpolate.Context + ctx interpolate.Context } func NewConfig(raws ...interface{}) (*Config, []string, error) {