1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Remove pkg directory

- As recommended by Docker committers.
- Will introduce internal directory when go supports it

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2015-05-16 16:02:51 -07:00
parent 8d4460a208
commit f16db2c3ad
30 changed files with 25 additions and 25 deletions

View file

@ -13,9 +13,9 @@ import (
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/docker/libnetwork" "github.com/docker/libnetwork"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/netlabel" "github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/pkg/options"
) )
const ( const (

View file

@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"github.com/docker/libnetwork" "github.com/docker/libnetwork"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/netlabel" "github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/pkg/options"
) )
func main() { func main() {

View file

@ -6,7 +6,7 @@ import (
"net" "net"
"github.com/docker/libnetwork" "github.com/docker/libnetwork"
"github.com/docker/libnetwork/pkg/options" "github.com/docker/libnetwork/options"
) )
func main() { func main() {

View file

@ -7,9 +7,9 @@ import (
"github.com/docker/libnetwork/driverapi" "github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/ipallocator" "github.com/docker/libnetwork/ipallocator"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/netlabel" "github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/pkg/options"
"github.com/docker/libnetwork/portmapper" "github.com/docker/libnetwork/portmapper"
"github.com/docker/libnetwork/sandbox" "github.com/docker/libnetwork/sandbox"
"github.com/docker/libnetwork/types" "github.com/docker/libnetwork/types"

View file

@ -7,9 +7,9 @@ import (
"regexp" "regexp"
"testing" "testing"
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/iptables"
"github.com/docker/libnetwork/pkg/netlabel"
"github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
) )

View file

@ -5,8 +5,8 @@ import (
"net" "net"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/iptables"
) )
type link struct { type link struct {

View file

@ -4,8 +4,8 @@ import (
"testing" "testing"
"github.com/docker/libnetwork/driverapi" "github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/netlabel"
"github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
) )

View file

@ -5,8 +5,8 @@ import (
"testing" "testing"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/netlabel"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"net" "net"
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/iptables"
) )
// DockerChain: DOCKER iptable chain name // DockerChain: DOCKER iptable chain name

View file

@ -4,8 +4,8 @@ import (
"net" "net"
"testing" "testing"
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/iptables"
) )
const ( const (

View file

@ -11,10 +11,10 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/ioutils"
"github.com/docker/libnetwork/driverapi" "github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/etchosts"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/etchosts" "github.com/docker/libnetwork/resolvconf"
"github.com/docker/libnetwork/pkg/netlabel"
"github.com/docker/libnetwork/pkg/resolvconf"
"github.com/docker/libnetwork/sandbox" "github.com/docker/libnetwork/sandbox"
"github.com/docker/libnetwork/types" "github.com/docker/libnetwork/types"
) )

View file

@ -15,9 +15,9 @@ import (
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/docker/libnetwork" "github.com/docker/libnetwork"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/netlabel" "github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/pkg/options"
"github.com/vishvananda/netns" "github.com/vishvananda/netns"
) )

View file

@ -5,8 +5,8 @@ import (
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/docker/libnetwork/driverapi" "github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/pkg/netlabel" "github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/pkg/options" "github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types" "github.com/docker/libnetwork/types"
) )

View file

@ -7,8 +7,8 @@ import (
"sync" "sync"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/pkg/iptables" "github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/pkg/portallocator" "github.com/docker/libnetwork/portallocator"
) )
type mapping struct { type mapping struct {

View file

@ -7,8 +7,8 @@ import (
"time" "time"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/pkg/iptables"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

View file

@ -10,7 +10,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/ioutils"
"github.com/docker/libnetwork/pkg/resolvconf/dns" "github.com/docker/libnetwork/resolvconf/dns"
) )
var ( var (