builder/docker: ctrl-C works during provisioning

builder/docker/step_provision.go

@@ -2,16 +2,14 @@ package docker
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/mitchellh/packer/common"
 )
 
 type StepProvision struct{}
 
 func (s *StepProvision) Run(state multistep.StateBag) multistep.StepAction {
 	containerId := state.Get("container_id").(string)
-	hook := state.Get("hook").(packer.Hook)
 	tempDir := state.Get("temp_dir").(string)
-	ui := state.Get("ui").(packer.Ui)
 
 	// Create the communicator that talks to Docker via various
 	// os/exec tricks.
@@ -21,13 +19,8 @@ func (s *StepProvision) Run(state multistep.StateBag) multistep.StepAction {
 		ContainerDir: "/packer-files",
 	}
 
-	// Run the provisioning hook
-	if err := hook.Run(packer.HookProvision, ui, comm, nil); err != nil {
-		state.Put("error", err)
-		return multistep.ActionHalt
-	}
-
-	return multistep.ActionContinue
+	prov := common.StepProvision{Comm: comm}
+	return prov.Run(state)
 }
 
 func (s *StepProvision) Cleanup(state multistep.StateBag) {}

common/step_provision.go

@@ -16,10 +16,16 @@ import (
 //
 // Produces:
 //   <nothing>
-type StepProvision struct{}
+type StepProvision struct {
+	Comm packer.Communicator
+}
+
+func (s *StepProvision) Run(state multistep.StateBag) multistep.StepAction {
+	comm := s.Comm
+	if comm == nil {
+		comm = state.Get("communicator").(packer.Communicator)
+	}
 
-func (*StepProvision) Run(state multistep.StateBag) multistep.StepAction {
-	comm := state.Get("communicator").(packer.Communicator)
 	hook := state.Get("hook").(packer.Hook)
 	ui := state.Get("ui").(packer.Ui)