GitList

Browse code

Add requested comments about old buggy behavior

Address comment: https://github.com/docker/docker/pull/25825/files/246d1eb58e807f2cf2d2b387e267dcfa228f96a8#r75242138

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Brian Goff authored on 2016/08/18 23:07:22
Showing 1 changed files

volume/local/local.go index 7303925..ef116f9 100644

volume/local/local.go

History View file @ c7075bd

@@ -95,6 +95,8 @@ func New(scope string, rootUID, rootGID int) (*Root, error) {
 			if err := json.Unmarshal(b, &opts); err != nil {
 				return nil, err
 			}
+			// Make sure this isn't an empty optsConfig.
+			// This could be empty due to buggy behavior in older versions of Docker.
 			if !reflect.DeepEqual(opts, optsConfig{}) {
 				v.opts = &opts
 			}

...	...	@@ -95,6 +95,8 @@ func New(scope string, rootUID, rootGID int) (*Root, error) {
95	95	if err := json.Unmarshal(b, &opts); err != nil {
96	96	return nil, err
97	97	}
	98	+ // Make sure this isn't an empty optsConfig.
	99	+ // This could be empty due to buggy behavior in older versions of Docker.
98	100	if !reflect.DeepEqual(opts, optsConfig{}) {
99	101	v.opts = &opts
100	102	}