From 0880df4644dcd6a6a79db27b7d0092c74bf90487 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Thu, 15 Jul 2021 18:08:17 +0200
Subject: [PATCH] pkg/signal: move Trap() to cmd/dockerd

It's the only location where this is used, and it's quite specific
to dockerd (not really a reusable function for external use), so
moving it into that package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 cmd/dockerd/daemon.go                               | 4 ++--
 {pkg/signal => cmd/dockerd/trap}/testfiles/main.go  | 4 ++--
 {pkg/signal => cmd/dockerd/trap}/trap.go            | 2 +-
 {pkg/signal => cmd/dockerd/trap}/trap_linux_test.go | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename {pkg/signal => cmd/dockerd/trap}/testfiles/main.go (91%)
 rename {pkg/signal => cmd/dockerd/trap}/trap.go (96%)
 rename {pkg/signal => cmd/dockerd/trap}/trap_linux_test.go (95%)

diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go
index 1841253a06..a42ccfac76 100644
--- a/cmd/dockerd/daemon.go
+++ b/cmd/dockerd/daemon.go
@@ -32,6 +32,7 @@ import (
 	buildkit "github.com/docker/docker/builder/builder-next"
 	"github.com/docker/docker/builder/dockerfile"
 	"github.com/docker/docker/cli/debug"
+	"github.com/docker/docker/cmd/dockerd/trap"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/daemon/cluster"
 	"github.com/docker/docker/daemon/config"
@@ -44,7 +45,6 @@ import (
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/pidfile"
 	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/docker/docker/pkg/system"
 	"github.com/docker/docker/plugin"
@@ -183,7 +183,7 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
 	stopc := make(chan bool)
 	defer close(stopc)
 
-	signal.Trap(func() {
+	trap.Trap(func() {
 		cli.stop()
 		<-stopc // wait for daemonCli.start() to return
 	}, logrus.StandardLogger())
diff --git a/pkg/signal/testfiles/main.go b/cmd/dockerd/trap/testfiles/main.go
similarity index 91%
rename from pkg/signal/testfiles/main.go
rename to cmd/dockerd/trap/testfiles/main.go
index e56854c7c3..22cb60bd00 100644
--- a/pkg/signal/testfiles/main.go
+++ b/cmd/dockerd/trap/testfiles/main.go
@@ -5,7 +5,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/docker/docker/pkg/signal"
+	"github.com/docker/docker/cmd/dockerd/trap"
 	"github.com/sirupsen/logrus"
 )
 
@@ -15,7 +15,7 @@ func main() {
 		"QUIT": syscall.SIGQUIT,
 		"INT":  os.Interrupt,
 	}
-	signal.Trap(func() {
+	trap.Trap(func() {
 		time.Sleep(time.Second)
 		os.Exit(99)
 	}, logrus.StandardLogger())
diff --git a/pkg/signal/trap.go b/cmd/dockerd/trap/trap.go
similarity index 96%
rename from pkg/signal/trap.go
rename to cmd/dockerd/trap/trap.go
index a838b3e7b9..fa21d99d04 100644
--- a/pkg/signal/trap.go
+++ b/cmd/dockerd/trap/trap.go
@@ -1,4 +1,4 @@
-package signal // import "github.com/docker/docker/pkg/signal"
+package trap // import "github.com/docker/docker/cmd/dockerd/trap"
 
 import (
 	"fmt"
diff --git a/pkg/signal/trap_linux_test.go b/cmd/dockerd/trap/trap_linux_test.go
similarity index 95%
rename from pkg/signal/trap_linux_test.go
rename to cmd/dockerd/trap/trap_linux_test.go
index 3dce0cd238..b283c7da0a 100644
--- a/pkg/signal/trap_linux_test.go
+++ b/cmd/dockerd/trap/trap_linux_test.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package signal // import "github.com/docker/docker/pkg/signal"
+package trap // import "github.com/docker/docker/cmd/dockerd/trap"
 
 import (
 	"io/ioutil"