@@ -4,9 +4,9 @@ import (

 	"runtime"

 	"github.com/docker/docker/daemon/config"

+	dopts "github.com/docker/docker/daemon/internal/opts"

 	"github.com/docker/docker/daemon/pkg/opts"

 	"github.com/docker/docker/daemon/pkg/registry"

-	dopts "github.com/docker/docker/internal/opts"

 	"github.com/spf13/pflag"

 )

@@ -13,9 +13,9 @@ import (

 	"dario.cat/mergo"

 	"github.com/containerd/log"

+	dopts "github.com/docker/docker/daemon/internal/opts"

 	"github.com/docker/docker/daemon/pkg/opts"

 	"github.com/docker/docker/daemon/pkg/registry"

-	dopts "github.com/docker/docker/internal/opts"

 	"github.com/moby/moby/api"

 	"github.com/moby/moby/api/types/versions"

 	"github.com/pkg/errors"

@@ -4,8 +4,8 @@ import (

 	"net/netip"

 	"testing"

+	dopts "github.com/docker/docker/daemon/internal/opts"

 	"github.com/docker/docker/daemon/pkg/opts"

-	dopts "github.com/docker/docker/internal/opts"

 	"github.com/google/go-cmp/cmp/cmpopts"

 	"github.com/moby/moby/api/types/container"

 	"github.com/spf13/pflag"

new file mode 100644

@@ -0,0 +1,25 @@

+package opts

+

+import (

+	"errors"

+	"net/netip"

+)

+

+// ValidateHostGatewayIPs makes sure the addresses are valid, and there's at-most one IPv4 and one IPv6 address.

+func ValidateHostGatewayIPs(hostGatewayIPs []netip.Addr) error {

+	var have4, have6 bool

+	for _, ip := range hostGatewayIPs {

+		if ip.Is4() {

+			if have4 {

+				return errors.New("only one IPv4 host gateway IP address can be specified")

+			}

+			have4 = true

+		} else {

+			if have6 {

+				return errors.New("only one IPv6 host gateway IP address can be specified")

+			}

+			have6 = true

+		}

+	}

+	return nil

+}

new file mode 100644

@@ -0,0 +1,48 @@

+package opts

+

+import (

+	"fmt"

+	"net/netip"

+)

+

+// NamedIPListOpts appends to an underlying []netip.Addr.

+type NamedIPListOpts struct {

+	name string

+	ips  *[]netip.Addr

+}

+

+// NewNamedIPListOptsRef constructs a NamedIPListOpts and returns its address.

+func NewNamedIPListOptsRef(name string, values *[]netip.Addr) *NamedIPListOpts {

+	return &NamedIPListOpts{

+		name: name,

+		ips:  values,

+	}

+}

+

+// String returns a string representation of the addresses in the underlying []netip.Addr.

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

+	if len(*o.ips) == 0 {

+		return ""

+	}

+	return fmt.Sprintf("%v", *o.ips)

+}

+

+// Set converts value to a netip.Addr and appends it to the underlying []netip.Addr.

+func (o *NamedIPListOpts) Set(value string) error {

+	ip, err := netip.ParseAddr(value)

+	if err != nil {

+		return err

+	}

+	*o.ips = append(*o.ips, ip)

+	return nil

+}

+

+// Type returns a string name for this Option type

+func (o *NamedIPListOpts) Type() string {

+	return "list"

+}

+

+// Name returns the name of the NamedIPListOpts in the configuration.

+func (o *NamedIPListOpts) Name() string {

+	return o.name

+}

new file mode 100644

@@ -0,0 +1,83 @@

+package opts

+

+import (

+	"errors"

+	"fmt"

+	"strconv"

+	"strings"

+

+	"github.com/docker/docker/daemon/pkg/opts"

+)

+

+// SetOpts holds a map of values and a validation function.

+type SetOpts struct {

+	values map[string]bool

+}

+

+// Set validates if needed the input value and add it to the

+// internal map, by splitting on '='.

+func (opts *SetOpts) Set(value string) error {

+	k, v, found := strings.Cut(value, "=")

+	if k == "" {

+		return errors.New("invalid option name: " + value)

+	}

+	var isSet bool

+	if !found {

+		isSet = true

+	} else {

+		var err error

+		isSet, err = strconv.ParseBool(v)

+		if err != nil {

+			return err

+		}

+	}

+	opts.values[k] = isSet

+	return nil

+}

+

+// GetAll returns the values of SetOpts as a map.

+func (opts *SetOpts) GetAll() map[string]bool {

+	return opts.values

+}

+

+func (opts *SetOpts) String() string {

+	return fmt.Sprintf("%v", opts.values)

+}

+

+// Type returns a string name for this Option type

+func (opts *SetOpts) Type() string {

+	return "map"

+}

+

+// NewSetOpts creates a new SetOpts with the specified set of values as a map of string to bool.

+func NewSetOpts(values map[string]bool) *SetOpts {

+	if values == nil {

+		values = make(map[string]bool)

+	}

+	return &SetOpts{

+		values: values,

+	}

+}

+

+// NamedSetOpts is a SetOpts struct with a configuration name.

+// This struct is useful to keep reference to the assigned

+// field name in the internal configuration struct.

+type NamedSetOpts struct {

+	SetOpts

+	name string

+}

+

+var _ opts.NamedOption = &NamedSetOpts{}

+

+// NewNamedSetOpts creates a reference to a new NamedSetOpts struct.

+func NewNamedSetOpts(name string, values map[string]bool) *NamedSetOpts {

+	return &NamedSetOpts{

+		SetOpts: *NewSetOpts(values),

+		name:    name,

+	}

+}

+

+// Name returns the name of the NamedSetOpts in the configuration.

+func (o *NamedSetOpts) Name() string {

+	return o.name

+}

new file mode 100644

@@ -0,0 +1,56 @@

+package opts

+

+import (

+	"testing"

+

+	"gotest.tools/v3/assert"

+	is "gotest.tools/v3/assert/cmp"

+)

+

+func TestSetOpts(t *testing.T) {

+	tmpMap := make(map[string]bool)

+	o := NewSetOpts(tmpMap)

+	assert.NilError(t, o.Set("feature-a=1"))

+	assert.NilError(t, o.Set("feature-b=true"))

+	assert.NilError(t, o.Set("feature-c=0"))

+	assert.NilError(t, o.Set("feature-d=false"))

+	assert.NilError(t, o.Set("feature-e"))

+

+	expected := "map[feature-a:true feature-b:true feature-c:false feature-d:false feature-e:true]"

+	assert.Check(t, is.Equal(expected, o.String()))

+

+	expectedValue := map[string]bool{"feature-a": true, "feature-b": true, "feature-c": false, "feature-d": false, "feature-e": true}

+	assert.Check(t, is.DeepEqual(expectedValue, o.GetAll()))

+

+	err := o.Set("feature=not-a-bool")

+	assert.Check(t, is.Error(err, `strconv.ParseBool: parsing "not-a-bool": invalid syntax`))

+	err = o.Set("feature=")

+	assert.Check(t, is.Error(err, `strconv.ParseBool: parsing "": invalid syntax`))

+	err = o.Set("=true")

+	assert.Check(t, is.Error(err, `invalid option name: =true`))

+}

+

+func TestNamedSetOpts(t *testing.T) {

+	tmpMap := make(map[string]bool)

+	o := NewNamedSetOpts("features", tmpMap)

+	assert.Check(t, is.Equal("features", o.Name()))

+

+	assert.NilError(t, o.Set("feature-a=1"))

+	assert.NilError(t, o.Set("feature-b=true"))

+	assert.NilError(t, o.Set("feature-c=0"))

+	assert.NilError(t, o.Set("feature-d=false"))

+	assert.NilError(t, o.Set("feature-e"))

+

+	expected := "map[feature-a:true feature-b:true feature-c:false feature-d:false feature-e:true]"

+	assert.Check(t, is.Equal(expected, o.String()))

+

+	expectedValue := map[string]bool{"feature-a": true, "feature-b": true, "feature-c": false, "feature-d": false, "feature-e": true}

+	assert.Check(t, is.DeepEqual(expectedValue, o.GetAll()))

+

+	err := o.Set("feature=not-a-bool")

+	assert.Check(t, is.Error(err, `strconv.ParseBool: parsing "not-a-bool": invalid syntax`))

+	err = o.Set("feature=")

+	assert.Check(t, is.Error(err, `strconv.ParseBool: parsing "": invalid syntax`))

+	err = o.Set("=true")

+	assert.Check(t, is.Error(err, `invalid option name: =true`))

+}

deleted file mode 100644

@@ -1,25 +0,0 @@

-package opts

-

-import (

-	"errors"

-	"net/netip"

-)

-

-// ValidateHostGatewayIPs makes sure the addresses are valid, and there's at-most one IPv4 and one IPv6 address.

-func ValidateHostGatewayIPs(hostGatewayIPs []netip.Addr) error {

-	var have4, have6 bool

-	for _, ip := range hostGatewayIPs {

-		if ip.Is4() {

-			if have4 {

-				return errors.New("only one IPv4 host gateway IP address can be specified")

-			}

-			have4 = true

-		} else {

-			if have6 {

-				return errors.New("only one IPv6 host gateway IP address can be specified")

-			}

-			have6 = true

-		}

-	}

-	return nil

-}

deleted file mode 100644

@@ -1,48 +0,0 @@

-package opts

-

-import (

-	"fmt"

-	"net/netip"

-)

-

-// NamedIPListOpts appends to an underlying []netip.Addr.

-type NamedIPListOpts struct {

-	name string

-	ips  *[]netip.Addr

-}

-

-// NewNamedIPListOptsRef constructs a NamedIPListOpts and returns its address.

-func NewNamedIPListOptsRef(name string, values *[]netip.Addr) *NamedIPListOpts {

-	return &NamedIPListOpts{

-		name: name,

-		ips:  values,

-	}

-}

-

-// String returns a string representation of the addresses in the underlying []netip.Addr.

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

-	if len(*o.ips) == 0 {

-		return ""

-	}

-	return fmt.Sprintf("%v", *o.ips)

-}

-

-// Set converts value to a netip.Addr and appends it to the underlying []netip.Addr.

-func (o *NamedIPListOpts) Set(value string) error {

-	ip, err := netip.ParseAddr(value)

-	if err != nil {

-		return err

-	}

-	*o.ips = append(*o.ips, ip)

-	return nil

-}

-

-// Type returns a string name for this Option type

-func (o *NamedIPListOpts) Type() string {

-	return "list"

-}

-

-// Name returns the name of the NamedIPListOpts in the configuration.

-func (o *NamedIPListOpts) Name() string {

-	return o.name

-}

deleted file mode 100644

@@ -1,83 +0,0 @@

-package opts

-

-import (

-	"errors"

-	"fmt"

-	"strconv"

-	"strings"

-

-	"github.com/docker/docker/daemon/pkg/opts"

-)

-

-// SetOpts holds a map of values and a validation function.

-type SetOpts struct {

-	values map[string]bool

-}

-

-// Set validates if needed the input value and add it to the

-// internal map, by splitting on '='.

-func (opts *SetOpts) Set(value string) error {

-	k, v, found := strings.Cut(value, "=")

-	if k == "" {

-		return errors.New("invalid option name: " + value)

-	}

-	var isSet bool

-	if !found {

-		isSet = true

-	} else {

-		var err error

-		isSet, err = strconv.ParseBool(v)

-		if err != nil {

-			return err

-		}

-	}

-	opts.values[k] = isSet

-	return nil

-}

-

-// GetAll returns the values of SetOpts as a map.

-func (opts *SetOpts) GetAll() map[string]bool {

-	return opts.values

-}

-

-func (opts *SetOpts) String() string {

-	return fmt.Sprintf("%v", opts.values)

-}

-

-// Type returns a string name for this Option type

-func (opts *SetOpts) Type() string {

-	return "map"

-}

-

-// NewSetOpts creates a new SetOpts with the specified set of values as a map of string to bool.

-func NewSetOpts(values map[string]bool) *SetOpts {

-	if values == nil {

-		values = make(map[string]bool)

-	}

-	return &SetOpts{

-		values: values,

-	}

-}

-

-// NamedSetOpts is a SetOpts struct with a configuration name.

-// This struct is useful to keep reference to the assigned

-// field name in the internal configuration struct.

-type NamedSetOpts struct {

-	SetOpts

-	name string

-}

-

-var _ opts.NamedOption = &NamedSetOpts{}

-

-// NewNamedSetOpts creates a reference to a new NamedSetOpts struct.

-func NewNamedSetOpts(name string, values map[string]bool) *NamedSetOpts {

-	return &NamedSetOpts{

-		SetOpts: *NewSetOpts(values),

-		name:    name,

-	}

-}

-

-// Name returns the name of the NamedSetOpts in the configuration.

-func (o *NamedSetOpts) Name() string {

-	return o.name

-}

deleted file mode 100644

@@ -1,56 +0,0 @@

-package opts

-

-import (

-	"testing"

-

-	"gotest.tools/v3/assert"

-	is "gotest.tools/v3/assert/cmp"

-)

-

-func TestSetOpts(t *testing.T) {

-	tmpMap := make(map[string]bool)

-	o := NewSetOpts(tmpMap)

-	assert.NilError(t, o.Set("feature-a=1"))

-	assert.NilError(t, o.Set("feature-b=true"))

-	assert.NilError(t, o.Set("feature-c=0"))

-	assert.NilError(t, o.Set("feature-d=false"))

-	assert.NilError(t, o.Set("feature-e"))

-

-	expected := "map[feature-a:true feature-b:true feature-c:false feature-d:false feature-e:true]"

-	assert.Check(t, is.Equal(expected, o.String()))

-

-	expectedValue := map[string]bool{"feature-a": true, "feature-b": true, "feature-c": false, "feature-d": false, "feature-e": true}

-	assert.Check(t, is.DeepEqual(expectedValue, o.GetAll()))

-

-	err := o.Set("feature=not-a-bool")

-	assert.Check(t, is.Error(err, `strconv.ParseBool: parsing "not-a-bool": invalid syntax`))

-	err = o.Set("feature=")

-	assert.Check(t, is.Error(err, `strconv.ParseBool: parsing "": invalid syntax`))

-	err = o.Set("=true")

-	assert.Check(t, is.Error(err, `invalid option name: =true`))

-}

-

-func TestNamedSetOpts(t *testing.T) {

-	tmpMap := make(map[string]bool)

-	o := NewNamedSetOpts("features", tmpMap)

-	assert.Check(t, is.Equal("features", o.Name()))

-

-	assert.NilError(t, o.Set("feature-a=1"))

-	assert.NilError(t, o.Set("feature-b=true"))

-	assert.NilError(t, o.Set("feature-c=0"))

-	assert.NilError(t, o.Set("feature-d=false"))

-	assert.NilError(t, o.Set("feature-e"))

-

-	expected := "map[feature-a:true feature-b:true feature-c:false feature-d:false feature-e:true]"

-	assert.Check(t, is.Equal(expected, o.String()))

-

-	expectedValue := map[string]bool{"feature-a": true, "feature-b": true, "feature-c": false, "feature-d": false, "feature-e": true}

-	assert.Check(t, is.DeepEqual(expectedValue, o.GetAll()))

-

-	err := o.Set("feature=not-a-bool")

-	assert.Check(t, is.Error(err, `strconv.ParseBool: parsing "not-a-bool": invalid syntax`))

-	err = o.Set("feature=")

-	assert.Check(t, is.Error(err, `strconv.ParseBool: parsing "": invalid syntax`))

-	err = o.Set("=true")

-	assert.Check(t, is.Error(err, `invalid option name: =true`))

-}