From fdaf4ed8d33bcdfb19fb1269a4c9d1c63e3cc3a5 Mon Sep 17 00:00:00 2001
From: Matthew Hooker <mwhooker@gmail.com>
Date: Fri, 8 Sep 2017 11:31:19 -0700
Subject: [PATCH] Gracefully clean up on SIGTERM

---
 command/build.go        | 3 ++-
 command/push.go         | 3 ++-
 main.go                 | 2 ++
 packer/plugin/server.go | 6 ++++--
 packer/ui.go            | 2 +-
 stdin.go                | 3 ++-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/command/build.go b/command/build.go
index de9da51ee..25fc96e71 100644
--- a/command/build.go
+++ b/command/build.go
@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"syscall"
 
 	"github.com/hashicorp/packer/helper/enumflag"
 	"github.com/hashicorp/packer/packer"
@@ -144,7 +145,7 @@ func (c BuildCommand) Run(args []string) int {
 
 		// Handle interrupts for this build
 		sigCh := make(chan os.Signal, 1)
-		signal.Notify(sigCh, os.Interrupt)
+		signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
 		defer signal.Stop(sigCh)
 		go func(b packer.Build) {
 			<-sigCh
diff --git a/command/push.go b/command/push.go
index e1d6c7db2..723e9d92c 100644
--- a/command/push.go
+++ b/command/push.go
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+	"syscall"
 
 	"github.com/hashicorp/atlas-go/archive"
 	"github.com/hashicorp/atlas-go/v1"
@@ -267,7 +268,7 @@ func (c *PushCommand) Run(args []string) int {
 
 	// Make a ctrl-C channel
 	sigCh := make(chan os.Signal, 1)
-	signal.Notify(sigCh, os.Interrupt)
+	signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
 	defer signal.Stop(sigCh)
 
 	err = nil
diff --git a/main.go b/main.go
index 689780cd4..b5c884eba 100644
--- a/main.go
+++ b/main.go
@@ -13,6 +13,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"sync"
+	"syscall"
 	"time"
 
 	"github.com/hashicorp/go-uuid"
@@ -86,6 +87,7 @@ func realMain() int {
 		wrapConfig.Writer = io.MultiWriter(logTempFile, logWriter)
 		wrapConfig.Stdout = outW
 		wrapConfig.DetectDuration = 500 * time.Millisecond
+		wrapConfig.ForwardSignals = []os.Signal{syscall.SIGTERM}
 		exitStatus, err := panicwrap.Wrap(&wrapConfig)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Couldn't start Packer: %s", err)
diff --git a/packer/plugin/server.go b/packer/plugin/server.go
index 667907a5f..470daf950 100644
--- a/packer/plugin/server.go
+++ b/packer/plugin/server.go
@@ -10,7 +10,6 @@ package plugin
 import (
 	"errors"
 	"fmt"
-	packrpc "github.com/hashicorp/packer/packer/rpc"
 	"io/ioutil"
 	"log"
 	"math/rand"
@@ -20,7 +19,10 @@ import (
 	"runtime"
 	"strconv"
 	"sync/atomic"
+	"syscall"
 	"time"
+
+	packrpc "github.com/hashicorp/packer/packer/rpc"
 )
 
 // This is a count of the number of interrupts the process has received.
@@ -87,7 +89,7 @@ func Server() (*packrpc.Server, error) {
 
 	// Eat the interrupts
 	ch := make(chan os.Signal, 1)
-	signal.Notify(ch, os.Interrupt)
+	signal.Notify(ch, os.Interrupt, syscall.SIGTERM)
 	go func() {
 		var count int32 = 0
 		for {
diff --git a/packer/ui.go b/packer/ui.go
index c107c23b8..c16a2eae0 100644
--- a/packer/ui.go
+++ b/packer/ui.go
@@ -180,7 +180,7 @@ func (rw *BasicUi) Ask(query string) (string, error) {
 		rw.scanner = bufio.NewScanner(rw.Reader)
 	}
 	sigCh := make(chan os.Signal, 1)
-	signal.Notify(sigCh, os.Interrupt)
+	signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
 	defer signal.Stop(sigCh)
 
 	log.Printf("ui: ask: %s", query)
diff --git a/stdin.go b/stdin.go
index 2df4153f5..758cc6864 100644
--- a/stdin.go
+++ b/stdin.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	"syscall"
 )
 
 // setupStdin switches out stdin for a pipe. We do this so that we can
@@ -26,7 +27,7 @@ func setupStdin() {
 	// Register a signal handler for interrupt in order to close the
 	// writer end of our pipe so that readers get EOF downstream.
 	ch := make(chan os.Signal, 1)
-	signal.Notify(ch, os.Interrupt)
+	signal.Notify(ch, os.Interrupt, syscall.SIGTERM)
 
 	go func() {
 		defer signal.Stop(ch)