From 7799ae27ca1dd85761f0595346a0dda15bbeda6c Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Mon, 23 Dec 2013 23:36:58 +0000 Subject: [PATCH] Move utility package 'iptables' to pkg/iptables --- integration/iptables_test.go | 2 +- links.go | 2 +- network.go | 2 +- network_test.go | 3 ++- {iptables => pkg/iptables}/MAINTAINERS | 0 {iptables => pkg/iptables}/iptables.go | 0 6 files changed, 5 insertions(+), 4 deletions(-) rename {iptables => pkg/iptables}/MAINTAINERS (100%) rename {iptables => pkg/iptables}/iptables.go (100%) diff --git a/integration/iptables_test.go b/integration/iptables_test.go index 060d0fe074..1dd4194350 100644 --- a/integration/iptables_test.go +++ b/integration/iptables_test.go @@ -1,7 +1,7 @@ package docker import ( - "github.com/dotcloud/docker/iptables" + "github.com/dotcloud/docker/pkg/iptables" "os" "testing" ) diff --git a/links.go b/links.go index 2fe255b4c5..55834b92d2 100644 --- a/links.go +++ b/links.go @@ -2,7 +2,7 @@ package docker import ( "fmt" - "github.com/dotcloud/docker/iptables" + "github.com/dotcloud/docker/pkg/iptables" "path" "strings" ) diff --git a/network.go b/network.go index 5ee5c4bee8..f02275d37a 100644 --- a/network.go +++ b/network.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "errors" "fmt" - "github.com/dotcloud/docker/iptables" + "github.com/dotcloud/docker/pkg/iptables" "github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/proxy" "github.com/dotcloud/docker/utils" diff --git a/network_test.go b/network_test.go index 184b497938..69fcba01a2 100644 --- a/network_test.go +++ b/network_test.go @@ -1,7 +1,7 @@ package docker import ( - "github.com/dotcloud/docker/iptables" + "github.com/dotcloud/docker/pkg/iptables" "github.com/dotcloud/docker/proxy" "net" "testing" @@ -340,6 +340,7 @@ func NewStubProxy(frontendAddr, backendAddr net.Addr) (proxy.Proxy, error) { } func TestPortMapper(t *testing.T) { + // FIXME: is this iptables chain still used anywhere? var chain *iptables.Chain mapper := &PortMapper{ tcpMapping: make(map[string]*net.TCPAddr), diff --git a/iptables/MAINTAINERS b/pkg/iptables/MAINTAINERS similarity index 100% rename from iptables/MAINTAINERS rename to pkg/iptables/MAINTAINERS diff --git a/iptables/iptables.go b/pkg/iptables/iptables.go similarity index 100% rename from iptables/iptables.go rename to pkg/iptables/iptables.go