@@ -27,9 +27,9 @@ import (

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/progress"

 	"github.com/docker/docker/pkg/streamformatter"

-	"github.com/docker/docker/pkg/ulimit"

 	"github.com/docker/docker/pkg/urlutil"

 	"github.com/docker/docker/reference"

+	runconfigopts "github.com/docker/docker/runconfig/opts"

 	"github.com/docker/docker/utils"

 	"github.com/docker/go-units"

 )

@@ -62,8 +62,8 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 	cmd.Var(&flBuildArg, []string{"-build-arg"}, "Set build-time variables")

 	isolation := cmd.String([]string{"-isolation"}, "", "Container isolation level")

-	ulimits := make(map[string]*ulimit.Ulimit)

-	flUlimits := opts.NewUlimitOpt(&ulimits)

+	ulimits := make(map[string]*units.Ulimit)

+	flUlimits := runconfigopts.NewUlimitOpt(&ulimits)

 	cmd.Var(flUlimits, []string{"-ulimit"}, "Ulimit options")

 	cmd.Require(flag.Exact, 1)

@@ -7,7 +7,8 @@ import (

 	"github.com/docker/docker/opts"

 	flag "github.com/docker/docker/pkg/mflag"

-	"github.com/docker/docker/pkg/ulimit"

+	runconfigopts "github.com/docker/docker/runconfig/opts"

+	"github.com/docker/go-units"

 )

 var (

@@ -27,7 +28,7 @@ type Config struct {

 	EnableSelinuxSupport bool

 	RemappedRoot         string

 	SocketGroup          string

-	Ulimits              map[string]*ulimit.Ulimit

+	Ulimits              map[string]*units.Ulimit

 }

 // bridgeConfig stores all the bridge driver specific

@@ -59,8 +60,8 @@ func (config *Config) InstallFlags(cmd *flag.FlagSet, usageFn func(string) strin

 	// Then platform-specific install flags

 	cmd.BoolVar(&config.EnableSelinuxSupport, []string{"-selinux-enabled"}, false, usageFn("Enable selinux support"))

 	cmd.StringVar(&config.SocketGroup, []string{"G", "-group"}, "docker", usageFn("Group for the unix socket"))

-	config.Ulimits = make(map[string]*ulimit.Ulimit)

-	cmd.Var(opts.NewUlimitOpt(&config.Ulimits), []string{"-default-ulimit"}, usageFn("Set default ulimits for containers"))

+	config.Ulimits = make(map[string]*units.Ulimit)

+	cmd.Var(runconfigopts.NewUlimitOpt(&config.Ulimits), []string{"-default-ulimit"}, usageFn("Set default ulimits for containers"))

 	cmd.BoolVar(&config.Bridge.EnableIPTables, []string{"#iptables", "-iptables"}, true, usageFn("Enable addition of iptables rules"))

 	cmd.BoolVar(&config.Bridge.EnableIPForward, []string{"#ip-forward", "-ip-forward"}, true, usageFn("Enable net.ipv4.ip_forward"))

 	cmd.BoolVar(&config.Bridge.EnableIPMasq, []string{"-ip-masq"}, true, usageFn("Enable IP masquerading"))

deleted file mode 100644

@@ -1,52 +0,0 @@

-package opts

-

-import (

-	"fmt"

-

-	"github.com/docker/docker/pkg/ulimit"

-)

-

-// UlimitOpt defines a map of Ulimits

-type UlimitOpt struct {

-	values *map[string]*ulimit.Ulimit

-}

-

-// NewUlimitOpt creates a new UlimitOpt

-func NewUlimitOpt(ref *map[string]*ulimit.Ulimit) *UlimitOpt {

-	if ref == nil {

-		ref = &map[string]*ulimit.Ulimit{}

-	}

-	return &UlimitOpt{ref}

-}

-

-// Set validates a Ulimit and sets its name as a key in UlimitOpt

-func (o *UlimitOpt) Set(val string) error {

-	l, err := ulimit.Parse(val)

-	if err != nil {

-		return err

-	}

-

-	(*o.values)[l.Name] = l

-

-	return nil

-}

-

-// String returns Ulimit values as a string.

-func (o *UlimitOpt) String() string {

-	var out []string

-	for _, v := range *o.values {

-		out = append(out, v.String())

-	}

-

-	return fmt.Sprintf("%v", out)

-}

-

-// GetList returns a slice of pointers to Ulimits.

-func (o *UlimitOpt) GetList() []*ulimit.Ulimit {

-	var ulimits []*ulimit.Ulimit

-	for _, v := range *o.values {

-		ulimits = append(ulimits, v)

-	}

-

-	return ulimits

-}

deleted file mode 100644

@@ -1,42 +0,0 @@

-package opts

-

-import (

-	"testing"

-

-	"github.com/docker/docker/pkg/ulimit"

-)

-

-func TestUlimitOpt(t *testing.T) {

-	ulimitMap := map[string]*ulimit.Ulimit{

-		"nofile": {"nofile", 1024, 512},

-	}

-

-	ulimitOpt := NewUlimitOpt(&ulimitMap)

-

-	expected := "[nofile=512:1024]"

-	if ulimitOpt.String() != expected {

-		t.Fatalf("Expected %v, got %v", expected, ulimitOpt)

-	}

-

-	// Valid ulimit append to opts

-	if err := ulimitOpt.Set("core=1024:1024"); err != nil {

-		t.Fatal(err)

-	}

-

-	// Invalid ulimit type returns an error and do not append to opts

-	if err := ulimitOpt.Set("notavalidtype=1024:1024"); err == nil {

-		t.Fatalf("Expected error on invalid ulimit type")

-	}

-	expected = "[nofile=512:1024 core=1024:1024]"

-	expected2 := "[core=1024:1024 nofile=512:1024]"

-	result := ulimitOpt.String()

-	if result != expected && result != expected2 {

-		t.Fatalf("Expected %v or %v, got %v", expected, expected2, ulimitOpt)

-	}

-

-	// And test GetList

-	ulimits := ulimitOpt.GetList()

-	if len(ulimits) != 2 {

-		t.Fatalf("Expected a ulimit list of 2, got %v", ulimits)

-	}

-}

new file mode 100644

@@ -0,0 +1,52 @@

+package opts

+

+import (

+	"fmt"

+

+	"github.com/docker/go-units"

+)

+

+// UlimitOpt defines a map of Ulimits

+type UlimitOpt struct {

+	values *map[string]*units.Ulimit

+}

+

+// NewUlimitOpt creates a new UlimitOpt

+func NewUlimitOpt(ref *map[string]*units.Ulimit) *UlimitOpt {

+	if ref == nil {

+		ref = &map[string]*units.Ulimit{}

+	}

+	return &UlimitOpt{ref}

+}

+

+// Set validates a Ulimit and sets its name as a key in UlimitOpt

+func (o *UlimitOpt) Set(val string) error {

+	l, err := units.ParseUlimit(val)

+	if err != nil {

+		return err

+	}

+

+	(*o.values)[l.Name] = l

+

+	return nil

+}

+

+// String returns Ulimit values as a string.

+func (o *UlimitOpt) String() string {

+	var out []string

+	for _, v := range *o.values {

+		out = append(out, v.String())

+	}

+

+	return fmt.Sprintf("%v", out)

+}

+

+// GetList returns a slice of pointers to Ulimits.

+func (o *UlimitOpt) GetList() []*units.Ulimit {

+	var ulimits []*units.Ulimit

+	for _, v := range *o.values {

+		ulimits = append(ulimits, v)

+	}

+

+	return ulimits

+}

new file mode 100644

@@ -0,0 +1,42 @@

+package opts

+

+import (

+	"testing"

+

+	"github.com/docker/go-units"

+)

+

+func TestUlimitOpt(t *testing.T) {

+	ulimitMap := map[string]*units.Ulimit{

+		"nofile": {"nofile", 1024, 512},

+	}

+

+	ulimitOpt := NewUlimitOpt(&ulimitMap)

+

+	expected := "[nofile=512:1024]"

+	if ulimitOpt.String() != expected {

+		t.Fatalf("Expected %v, got %v", expected, ulimitOpt)

+	}

+

+	// Valid ulimit append to opts

+	if err := ulimitOpt.Set("core=1024:1024"); err != nil {

+		t.Fatal(err)

+	}

+

+	// Invalid ulimit type returns an error and do not append to opts

+	if err := ulimitOpt.Set("notavalidtype=1024:1024"); err == nil {

+		t.Fatalf("Expected error on invalid ulimit type")

+	}

+	expected = "[nofile=512:1024 core=1024:1024]"

+	expected2 := "[core=1024:1024 nofile=512:1024]"

+	result := ulimitOpt.String()

+	if result != expected && result != expected2 {

+		t.Fatalf("Expected %v or %v, got %v", expected, expected2, ulimitOpt)

+	}

+

+	// And test GetList

+	ulimits := ulimitOpt.GetList()

+	if len(ulimits) != 2 {

+		t.Fatalf("Expected a ulimit list of 2, got %v", ulimits)

+	}

+}

@@ -12,6 +12,7 @@ import (

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/mount"

 	"github.com/docker/docker/pkg/signal"

+	runconfigopts "github.com/docker/docker/runconfig/opts"

 	"github.com/docker/docker/volume"

 	"github.com/docker/go-connections/nat"

 	"github.com/docker/go-units"

@@ -63,7 +64,7 @@ func Parse(cmd *flag.FlagSet, args []string) (*container.Config, *container.Host

 		flLabels            = opts.NewListOpts(opts.ValidateEnv)

 		flDevices           = opts.NewListOpts(ValidateDevice)

-		flUlimits = opts.NewUlimitOpt(nil)

+		flUlimits = runconfigopts.NewUlimitOpt(nil)

 		flPublish           = opts.NewListOpts(nil)

 		flExpose            = opts.NewListOpts(nil)