vendor: github.com/docker/docker 2ed904cad7055847796433cc56ef1d1de0da868c

- replace deprecated types
- also fixing some minor nits

full diff: https://github.com/docker/docker/compare/8941dcfcc5db...2ed904cad7055847796433cc56ef1d1de0da868c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

internal/test/builders/volume.go

@@ -1,13 +1,11 @@
 package builders
 
-import (
-	"github.com/docker/docker/api/types"
-)
+import "github.com/docker/docker/api/types/volume"
 
 // Volume creates a volume with default values.
 // Any number of volume function builder can be passed to augment it.
-func Volume(builders ...func(volume *types.Volume)) *types.Volume {
-	volume := &types.Volume{
+func Volume(builders ...func(volume *volume.Volume)) *volume.Volume {
+	vol := &volume.Volume{
 		Name:       "volume",
 		Driver:     "local",
 		Mountpoint: "/data/volume",
@@ -15,29 +13,29 @@ func Volume(builders ...func(volume *types.Volume)) *types.Volume {
 	}
 
 	for _, builder := range builders {
-		builder(volume)
+		builder(vol)
 	}
 
-	return volume
+	return vol
 }
 
 // VolumeLabels sets the volume labels
-func VolumeLabels(labels map[string]string) func(volume *types.Volume) {
-	return func(volume *types.Volume) {
+func VolumeLabels(labels map[string]string) func(volume *volume.Volume) {
+	return func(volume *volume.Volume) {
 		volume.Labels = labels
 	}
 }
 
 // VolumeName sets the volume labels
-func VolumeName(name string) func(volume *types.Volume) {
-	return func(volume *types.Volume) {
+func VolumeName(name string) func(volume *volume.Volume) {
+	return func(volume *volume.Volume) {
 		volume.Name = name
 	}
 }
 
 // VolumeDriver sets the volume driver
-func VolumeDriver(name string) func(volume *types.Volume) {
-	return func(volume *types.Volume) {
+func VolumeDriver(name string) func(volume *volume.Volume) {
+	return func(volume *volume.Volume) {
 		volume.Driver = name
 	}
 }