new file mode 100644

@@ -0,0 +1,30 @@

+package opts

+

+// QuotedString is a string that may have extra quotes around the value. The

+// quotes are stripped from the value.

+type QuotedString string

+

+// Set sets a new value

+func (s *QuotedString) Set(val string) error {

+	*s = QuotedString(trimQuotes(val))

+	return nil

+}

+

+// Type returns the type of the value

+func (s *QuotedString) Type() string {

+	return "string"

+}

+

+func (s *QuotedString) String() string {

+	return string(*s)

+}

+

+func trimQuotes(value string) string {

+	lastIndex := len(value) - 1

+	for _, char := range []byte{'\'', '"'} {

+		if value[0] == char && value[lastIndex] == char {

+			return value[1:lastIndex]

+		}

+	}

+	return value

+}

new file mode 100644

@@ -0,0 +1,24 @@

+package opts

+

+import (

+	"github.com/docker/docker/pkg/testutil/assert"

+	"testing"

+)

+

+func TestQuotedStringSetWithQuotes(t *testing.T) {

+	qs := QuotedString("")

+	assert.NilError(t, qs.Set("\"something\""))

+	assert.Equal(t, qs.String(), "something")

+}

+

+func TestQuotedStringSetWithMismatchedQuotes(t *testing.T) {

+	qs := QuotedString("")

+	assert.NilError(t, qs.Set("\"something'"))

+	assert.Equal(t, qs.String(), "\"something'")

+}

+

+func TestQuotedStringSetWithNoQuotes(t *testing.T) {

+	qs := QuotedString("")

+	assert.NilError(t, qs.Set("something"))

+	assert.Equal(t, qs.String(), "something")

+}