From 98047c5190ffea19920abfb184a0807de6d4245e Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 15 May 2025 14:02:51 -0700 Subject: [PATCH] Move cmd/dockerd/trap to daemon/command/trap Signed-off-by: Derek McGowan --- cmd/dockerd/daemon.go | 2 +- {cmd/dockerd => daemon/command}/trap/testfiles/main.go | 2 +- {cmd/dockerd => daemon/command}/trap/trap.go | 0 {cmd/dockerd => daemon/command}/trap/trap_linux_test.go | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {cmd/dockerd => daemon/command}/trap/testfiles/main.go (92%) rename {cmd/dockerd => daemon/command}/trap/trap.go (100%) rename {cmd/dockerd => daemon/command}/trap/trap_linux_test.go (100%) diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index f0a8e366cd..0ad8b0cec2 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -39,10 +39,10 @@ import ( buildkit "github.com/docker/docker/builder/builder-next" "github.com/docker/docker/builder/builder-next/exporter" "github.com/docker/docker/builder/dockerfile" - "github.com/docker/docker/cmd/dockerd/trap" "github.com/docker/docker/daemon" "github.com/docker/docker/daemon/cluster" "github.com/docker/docker/daemon/command/debug" + "github.com/docker/docker/daemon/command/trap" "github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/listeners" "github.com/docker/docker/dockerversion" diff --git a/cmd/dockerd/trap/testfiles/main.go b/daemon/command/trap/testfiles/main.go similarity index 92% rename from cmd/dockerd/trap/testfiles/main.go rename to daemon/command/trap/testfiles/main.go index 40b64bd534..fc5a38277b 100644 --- a/cmd/dockerd/trap/testfiles/main.go +++ b/daemon/command/trap/testfiles/main.go @@ -5,7 +5,7 @@ import ( "syscall" "time" - "github.com/docker/docker/cmd/dockerd/trap" + "github.com/docker/docker/daemon/command/trap" ) func main() { diff --git a/cmd/dockerd/trap/trap.go b/daemon/command/trap/trap.go similarity index 100% rename from cmd/dockerd/trap/trap.go rename to daemon/command/trap/trap.go diff --git a/cmd/dockerd/trap/trap_linux_test.go b/daemon/command/trap/trap_linux_test.go similarity index 100% rename from cmd/dockerd/trap/trap_linux_test.go rename to daemon/command/trap/trap_linux_test.go