Merge pull request #400 from rheinwein/ljf-update-docker-plugin-getter

Update dependency path for docker/docker/pkg/plugingetter

Author: vdemeester

hack/vendor.sh

@@ -9,7 +9,7 @@ clone git github.com/Sirupsen/logrus v0.10.0
 clone git github.com/urfave/cli v1.18.0
 clone git github.com/docker/distribution 77b9d2997abcded79a5314970fe69a44c93c25fb
 clone git github.com/vbatts/tar-split v0.9.11
-clone git github.com/docker/docker 601004e1a714d77d3a43e957b8ae8adbc867b280
+clone git github.com/docker/docker 8658748ef716e43a5f6d834825d818012ed6e2c4
 clone git github.com/docker/go-units f2145db703495b2e525c59662db69a7344b00bb8
 clone git github.com/docker/go-connections 988efe982fdecb46f01d53465878ff1f2ff411ce
 clone git github.com/flynn/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff

test/nop.go

@@ -196,6 +196,11 @@ func (client *NopClient) ContainerWait(ctx context.Context, container string) (i
 	return 0, errNoEngine
 }
 
+// ContainersPrune requests the daemon to delete unused data
+func (client *NopClient) ContainersPrune(ctx context.Context, cfg types.ContainersPruneConfig) (types.ContainersPruneReport, error) {
+	return types.ContainersPruneReport{}, errNoEngine
+}
+
 // CopyFromContainer gets the content from the container and returns it as a Reader to manipulate it in the host
 func (client *NopClient) CopyFromContainer(ctx context.Context, container, srcPath string) (io.ReadCloser, types.ContainerPathStat, error) {
 	return nil, types.ContainerPathStat{}, errNoEngine
@@ -206,6 +211,11 @@ func (client *NopClient) CopyToContainer(ctx context.Context, container, path st
 	return errNoEngine
 }
 
+// DiskUsage requests the current data usage from the daemon
+func (client *NopClient) DiskUsage(ctx context.Context) (types.DiskUsage, error) {
+	return types.DiskUsage{}, errNoEngine
+}
+
 // Events returns a stream of events in the daemon in a ReadCloser
 func (client *NopClient) Events(ctx context.Context, options types.EventsOptions) (<-chan events.Message, <-chan error) {
 	return nil, nil
@@ -276,6 +286,11 @@ func (client *NopClient) ImageTag(ctx context.Context, image, ref string) error
 	return errNoEngine
 }
 
+// ImagesPrune requests the daemon to delete unused data
+func (client *NopClient) ImagesPrune(ctx context.Context, cfg types.ImagesPruneConfig) (types.ImagesPruneReport, error) {
+	return types.ImagesPruneReport{}, errNoEngine
+}
+
 // Info returns information about the docker server
 func (client *NopClient) Info(ctx context.Context) (types.Info, error) {
 	return types.Info{}, errNoEngine
@@ -354,3 +369,8 @@ func (client *NopClient) VolumeList(ctx context.Context, filter filters.Args) (t
 func (client *NopClient) VolumeRemove(ctx context.Context, volumeID string, force bool) error {
 	return errNoEngine
 }
+
+// VolumesPrune requests the daemon to delete unused data
+func (client *NopClient) VolumesPrune(ctx context.Context, cfg types.VolumesPruneConfig) (types.VolumesPruneReport, error) {
+	return types.VolumesPruneReport{}, errNoEngine
+}