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

Merge pull request #14297 from pwaller/move-nat-pkg

Browse source 
Move /nat to /pkg/nat
This commit is contained in:
Alexander Morozov 2015-06-30 13:23:30 -07:00
commit caa4acc7b1
20 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client/port.go
View file

@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/docker/docker/nat"
flag "github.com/docker/docker/pkg/mflag" flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/pkg/nat"
) )
// CmdPort lists port mappings for a container. // CmdPort lists port mappings for a container.

2
builder/dispatchers.go
View file

@ -18,8 +18,8 @@ import (
"strings" "strings"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/nat"
flag "github.com/docker/docker/pkg/mflag" flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/pkg/nat"
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"
) )

2
daemon/container.go
View file

@ -21,12 +21,12 @@ import (
"github.com/docker/docker/daemon/logger/jsonfilelog" "github.com/docker/docker/daemon/logger/jsonfilelog"
"github.com/docker/docker/daemon/network" "github.com/docker/docker/daemon/network"
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/broadcastwriter" "github.com/docker/docker/pkg/broadcastwriter"
"github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/jsonlog" "github.com/docker/docker/pkg/jsonlog"
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/nat"
"github.com/docker/docker/pkg/promise" "github.com/docker/docker/pkg/promise"
"github.com/docker/docker/pkg/symlink" "github.com/docker/docker/pkg/symlink"
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"

2
daemon/container_linux.go
View file

@ -18,10 +18,10 @@ import (
"github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/daemon/network" "github.com/docker/docker/daemon/network"
"github.com/docker/docker/links" "github.com/docker/docker/links"
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/directory" "github.com/docker/docker/pkg/directory"
"github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/nat"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/pkg/ulimit" "github.com/docker/docker/pkg/ulimit"
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"

2
daemon/container_unit_test.go
View file

@ -1,7 +1,7 @@
package daemon package daemon
import ( import (
"github.com/docker/docker/nat" "github.com/docker/docker/pkg/nat"
"testing" "testing"
) )

2
daemon/list.go
View file

@ -7,8 +7,8 @@ import (
"strings" "strings"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/graphdb" "github.com/docker/docker/pkg/graphdb"
"github.com/docker/docker/pkg/nat"
"github.com/docker/docker/pkg/parsers/filters" "github.com/docker/docker/pkg/parsers/filters"
) )

2
daemon/network/settings.go
View file

@ -1,6 +1,6 @@
package network package network
import "github.com/docker/docker/nat" import "github.com/docker/docker/pkg/nat"
type Address struct { type Address struct {
Addr string Addr string

2
integration-cli/docker_cli_create_test.go
View file

@ -9,7 +9,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/docker/docker/nat" "github.com/docker/docker/pkg/nat"
"github.com/go-check/check" "github.com/go-check/check"
) )

2
integration-cli/docker_cli_run_test.go
View file

@ -18,7 +18,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/docker/docker/nat" "github.com/docker/docker/pkg/nat"
"github.com/docker/libnetwork/resolvconf" "github.com/docker/libnetwork/resolvconf"
"github.com/go-check/check" "github.com/go-check/check"
) )

2
links/links.go
View file

@ -5,7 +5,7 @@ import (
"path" "path"
"strings" "strings"
"github.com/docker/docker/nat" "github.com/docker/docker/pkg/nat"
) )
type Link struct { type Link struct {

2
links/links_test.go
View file

@ -5,7 +5,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/docker/docker/nat" "github.com/docker/docker/pkg/nat"
) )
func TestLinkNaming(t *testing.T) { func TestLinkNaming(t *testing.T) {

0
nat/nat.go → pkg/nat/nat.go
View file

0
nat/nat_test.go → pkg/nat/nat_test.go
View file

0
nat/sort.go → pkg/nat/sort.go
View file

0
nat/sort_test.go → pkg/nat/sort_test.go
View file

2
runconfig/config.go
View file

@ -5,7 +5,7 @@ import (
"io" "io"
"strings" "strings"
"github.com/docker/docker/nat" "github.com/docker/docker/pkg/nat"
) )
// Entrypoint encapsulates the container entrypoint. // Entrypoint encapsulates the container entrypoint.

2
runconfig/config_test.go
View file

@ -8,7 +8,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/docker/docker/nat" "github.com/docker/docker/pkg/nat"
) )
func parse(t *testing.T, args string) (*Config, *HostConfig, error) { func parse(t *testing.T, args string) (*Config, *HostConfig, error) {

2
runconfig/hostconfig.go
View file

@ -5,7 +5,7 @@ import (
"io" "io"
"strings" "strings"
"github.com/docker/docker/nat" "github.com/docker/docker/pkg/nat"
"github.com/docker/docker/pkg/ulimit" "github.com/docker/docker/pkg/ulimit"
) )

2
runconfig/merge.go
View file

@ -3,7 +3,7 @@ package runconfig
import ( import (
"strings" "strings"
"github.com/docker/docker/nat" "github.com/docker/docker/pkg/nat"
) )
func Merge(userConf, imageConf *Config) error { func Merge(userConf, imageConf *Config) error {

2
runconfig/parse.go
View file

@ -5,9 +5,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/docker/docker/nat"
"github.com/docker/docker/opts" "github.com/docker/docker/opts"
flag "github.com/docker/docker/pkg/mflag" flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/pkg/nat"
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/ulimit" "github.com/docker/docker/pkg/ulimit"
"github.com/docker/docker/pkg/units" "github.com/docker/docker/pkg/units"