From c204fce2ee926417d1dc7d10c043a81b93d2a72b Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 8 Aug 2017 18:14:04 +0200 Subject: [PATCH] Move pkg/listeners away It is only used in `daemon` and should really live there. Signed-off-by: Vincent Demeester --- cmd/dockerd/daemon.go | 2 +- {pkg => daemon}/listeners/group_unix.go | 0 {pkg => daemon}/listeners/listeners_solaris.go | 0 {pkg => daemon}/listeners/listeners_unix.go | 0 {pkg => daemon}/listeners/listeners_windows.go | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename {pkg => daemon}/listeners/group_unix.go (100%) rename {pkg => daemon}/listeners/listeners_solaris.go (100%) rename {pkg => daemon}/listeners/listeners_unix.go (100%) rename {pkg => daemon}/listeners/listeners_windows.go (100%) diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index b15bd2bf8e..d36c294ec3 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -32,13 +32,13 @@ import ( "github.com/docker/docker/daemon" "github.com/docker/docker/daemon/cluster" "github.com/docker/docker/daemon/config" + "github.com/docker/docker/daemon/listeners" "github.com/docker/docker/daemon/logger" "github.com/docker/docker/dockerversion" "github.com/docker/docker/libcontainerd" dopts "github.com/docker/docker/opts" "github.com/docker/docker/pkg/authorization" "github.com/docker/docker/pkg/jsonlog" - "github.com/docker/docker/pkg/listeners" "github.com/docker/docker/pkg/pidfile" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/signal" diff --git a/pkg/listeners/group_unix.go b/daemon/listeners/group_unix.go similarity index 100% rename from pkg/listeners/group_unix.go rename to daemon/listeners/group_unix.go diff --git a/pkg/listeners/listeners_solaris.go b/daemon/listeners/listeners_solaris.go similarity index 100% rename from pkg/listeners/listeners_solaris.go rename to daemon/listeners/listeners_solaris.go diff --git a/pkg/listeners/listeners_unix.go b/daemon/listeners/listeners_unix.go similarity index 100% rename from pkg/listeners/listeners_unix.go rename to daemon/listeners/listeners_unix.go diff --git a/pkg/listeners/listeners_windows.go b/daemon/listeners/listeners_windows.go similarity index 100% rename from pkg/listeners/listeners_windows.go rename to daemon/listeners/listeners_windows.go