@@ -128,14 +128,12 @@ func (d *DryRunClient) ContainerInspect(ctx context.Context, container string) (
128128 }
129129 }
130130 return containerType.InspectResponse {
131- ContainerJSONBase : & containerType.ContainerJSONBase {
132- ID : id ,
133- Name : container ,
134- State : & containerType.State {
135- Status : containerType .StateRunning , // needed for --wait option
136- Health : & containerType.Health {
137- Status : containerType .Healthy , // needed for healthcheck control
138- },
131+ ID : id ,
132+ Name : container ,
133+ State : & containerType.State {
134+ Status : containerType .StateRunning , // needed for --wait option
135+ Health : & containerType.Health {
136+ Status : containerType .Healthy , // needed for healthcheck control
139137 },
140138 },
141139 Mounts : nil ,
@@ -245,15 +243,15 @@ func (d *DryRunClient) ImageInspectWithRaw(ctx context.Context, imageName string
245243 return resp , buf .Bytes (), err
246244}
247245
248- func (d * DryRunClient ) ImagePull (ctx context.Context , ref string , options image. PullOptions ) (io.ReadCloser , error ) {
246+ func (d * DryRunClient ) ImagePull (ctx context.Context , ref string , options client. ImagePullOptions ) (io.ReadCloser , error ) {
249247 if _ , _ , err := d .resolver .Resolve (ctx , ref ); err != nil {
250248 return nil , err
251249 }
252250 rc := io .NopCloser (strings .NewReader ("" ))
253251 return rc , nil
254252}
255253
256- func (d * DryRunClient ) ImagePush (ctx context.Context , ref string , options image. PushOptions ) (io.ReadCloser , error ) {
254+ func (d * DryRunClient ) ImagePush (ctx context.Context , ref string , options client. ImagePushOptions ) (io.ReadCloser , error ) {
257255 if _ , _ , err := d .resolver .Resolve (ctx , ref ); err != nil {
258256 return nil , err
259257 }
@@ -277,15 +275,15 @@ func (d *DryRunClient) ImagePush(ctx context.Context, ref string, options image.
277275 return rc , nil
278276}
279277
280- func (d * DryRunClient ) ImageRemove (ctx context.Context , imageName string , options image. RemoveOptions ) ([]image.DeleteResponse , error ) {
278+ func (d * DryRunClient ) ImageRemove (ctx context.Context , imageName string , options client. ImageRemoveOptions ) ([]image.DeleteResponse , error ) {
281279 return nil , nil
282280}
283281
284282func (d * DryRunClient ) NetworkConnect (ctx context.Context , networkName , container string , config * network.EndpointSettings ) error {
285283 return nil
286284}
287285
288- func (d * DryRunClient ) NetworkCreate (ctx context.Context , name string , options network. CreateOptions ) (network.CreateResponse , error ) {
286+ func (d * DryRunClient ) NetworkCreate (ctx context.Context , name string , options client. NetworkCreateOptions ) (network.CreateResponse , error ) {
289287 return network.CreateResponse {
290288 ID : name ,
291289 Warning : "" ,
@@ -339,7 +337,7 @@ func (d *DryRunClient) ContainerExecStart(ctx context.Context, execID string, co
339337
340338// Functions delegated to original APIClient (not used by Compose or not modifying the Compose stack
341339
342- func (d * DryRunClient ) ConfigList (ctx context.Context , options swarm .ConfigListOptions ) ([]swarm.Config , error ) {
340+ func (d * DryRunClient ) ConfigList (ctx context.Context , options client .ConfigListOptions ) ([]swarm.Config , error ) {
343341 return d .apiClient .ConfigList (ctx , options )
344342}
345343
@@ -375,7 +373,7 @@ func (d *DryRunClient) ContainerExecInspect(ctx context.Context, execID string)
375373 return d .apiClient .ContainerExecInspect (ctx , execID )
376374}
377375
378- func (d * DryRunClient ) ContainerExecResize (ctx context.Context , execID string , options containerType. ResizeOptions ) error {
376+ func (d * DryRunClient ) ContainerExecResize (ctx context.Context , execID string , options client. ContainerResizeOptions ) error {
379377 return d .apiClient .ContainerExecResize (ctx , execID , options )
380378}
381379
@@ -391,7 +389,7 @@ func (d *DryRunClient) ContainerLogs(ctx context.Context, container string, opti
391389 return d .apiClient .ContainerLogs (ctx , container , options )
392390}
393391
394- func (d * DryRunClient ) ContainerResize (ctx context.Context , container string , options containerType. ResizeOptions ) error {
392+ func (d * DryRunClient ) ContainerResize (ctx context.Context , container string , options client. ContainerResizeOptions ) error {
395393 return d .apiClient .ContainerResize (ctx , container , options )
396394}
397395
@@ -435,27 +433,27 @@ func (d *DryRunClient) BuildCancel(ctx context.Context, id string) error {
435433 return d .apiClient .BuildCancel (ctx , id )
436434}
437435
438- func (d * DryRunClient ) ImageCreate (ctx context.Context , parentReference string , options image. CreateOptions ) (io.ReadCloser , error ) {
436+ func (d * DryRunClient ) ImageCreate (ctx context.Context , parentReference string , options client. ImageCreateOptions ) (io.ReadCloser , error ) {
439437 return d .apiClient .ImageCreate (ctx , parentReference , options )
440438}
441439
442440func (d * DryRunClient ) ImageHistory (ctx context.Context , imageName string , options ... client.ImageHistoryOption ) ([]image.HistoryResponseItem , error ) {
443441 return d .apiClient .ImageHistory (ctx , imageName , options ... )
444442}
445443
446- func (d * DryRunClient ) ImageImport (ctx context.Context , source image. ImportSource , ref string , options image. ImportOptions ) (io.ReadCloser , error ) {
444+ func (d * DryRunClient ) ImageImport (ctx context.Context , source client. ImageImportSource , ref string , options client. ImageImportOptions ) (io.ReadCloser , error ) {
447445 return d .apiClient .ImageImport (ctx , source , ref , options )
448446}
449447
450- func (d * DryRunClient ) ImageList (ctx context.Context , options image. ListOptions ) ([]image.Summary , error ) {
448+ func (d * DryRunClient ) ImageList (ctx context.Context , options client. ImageListOptions ) ([]image.Summary , error ) {
451449 return d .apiClient .ImageList (ctx , options )
452450}
453451
454452func (d * DryRunClient ) ImageLoad (ctx context.Context , input io.Reader , options ... client.ImageLoadOption ) (image.LoadResponse , error ) {
455453 return d .apiClient .ImageLoad (ctx , input , options ... )
456454}
457455
458- func (d * DryRunClient ) ImageSearch (ctx context.Context , term string , options registry. SearchOptions ) ([]registry.SearchResult , error ) {
456+ func (d * DryRunClient ) ImageSearch (ctx context.Context , term string , options client. ImageSearchOptions ) ([]registry.SearchResult , error ) {
459457 return d .apiClient .ImageSearch (ctx , term , options )
460458}
461459
@@ -475,27 +473,27 @@ func (d *DryRunClient) NodeInspectWithRaw(ctx context.Context, nodeID string) (s
475473 return d .apiClient .NodeInspectWithRaw (ctx , nodeID )
476474}
477475
478- func (d * DryRunClient ) NodeList (ctx context.Context , options swarm .NodeListOptions ) ([]swarm.Node , error ) {
476+ func (d * DryRunClient ) NodeList (ctx context.Context , options client .NodeListOptions ) ([]swarm.Node , error ) {
479477 return d .apiClient .NodeList (ctx , options )
480478}
481479
482- func (d * DryRunClient ) NodeRemove (ctx context.Context , nodeID string , options swarm .NodeRemoveOptions ) error {
480+ func (d * DryRunClient ) NodeRemove (ctx context.Context , nodeID string , options client .NodeRemoveOptions ) error {
483481 return d .apiClient .NodeRemove (ctx , nodeID , options )
484482}
485483
486484func (d * DryRunClient ) NodeUpdate (ctx context.Context , nodeID string , version swarm.Version , node swarm.NodeSpec ) error {
487485 return d .apiClient .NodeUpdate (ctx , nodeID , version , node )
488486}
489487
490- func (d * DryRunClient ) NetworkInspect (ctx context.Context , networkName string , options network. InspectOptions ) (network.Inspect , error ) {
488+ func (d * DryRunClient ) NetworkInspect (ctx context.Context , networkName string , options client. NetworkInspectOptions ) (network.Inspect , error ) {
491489 return d .apiClient .NetworkInspect (ctx , networkName , options )
492490}
493491
494- func (d * DryRunClient ) NetworkInspectWithRaw (ctx context.Context , networkName string , options network. InspectOptions ) (network.Inspect , []byte , error ) {
492+ func (d * DryRunClient ) NetworkInspectWithRaw (ctx context.Context , networkName string , options client. NetworkInspectOptions ) (network.Inspect , []byte , error ) {
495493 return d .apiClient .NetworkInspectWithRaw (ctx , networkName , options )
496494}
497495
498- func (d * DryRunClient ) NetworkList (ctx context.Context , options network. ListOptions ) ([]network.Inspect , error ) {
496+ func (d * DryRunClient ) NetworkList (ctx context.Context , options client. NetworkListOptions ) ([]network.Inspect , error ) {
499497 return d .apiClient .NetworkList (ctx , options )
500498}
501499
@@ -543,24 +541,24 @@ func (d *DryRunClient) PluginCreate(ctx context.Context, createContext io.Reader
543541 return d .apiClient .PluginCreate (ctx , createContext , options )
544542}
545543
546- func (d * DryRunClient ) ServiceCreate (ctx context.Context , service swarm.ServiceSpec , options swarm .ServiceCreateOptions ) (swarm.ServiceCreateResponse , error ) {
544+ func (d * DryRunClient ) ServiceCreate (ctx context.Context , service swarm.ServiceSpec , options client .ServiceCreateOptions ) (swarm.ServiceCreateResponse , error ) {
547545 return d .apiClient .ServiceCreate (ctx , service , options )
548546}
549547
550- func (d * DryRunClient ) ServiceInspectWithRaw (ctx context.Context , serviceID string , options swarm .ServiceInspectOptions ) (swarm.Service , []byte , error ) {
548+ func (d * DryRunClient ) ServiceInspectWithRaw (ctx context.Context , serviceID string , options client .ServiceInspectOptions ) (swarm.Service , []byte , error ) {
551549 return d .apiClient .ServiceInspectWithRaw (ctx , serviceID , options )
552550}
553551
554- func (d * DryRunClient ) ServiceList (ctx context.Context , options swarm .ServiceListOptions ) ([]swarm.Service , error ) {
552+ func (d * DryRunClient ) ServiceList (ctx context.Context , options client .ServiceListOptions ) ([]swarm.Service , error ) {
555553 return d .apiClient .ServiceList (ctx , options )
556554}
557555
558556func (d * DryRunClient ) ServiceRemove (ctx context.Context , serviceID string ) error {
559557 return d .apiClient .ServiceRemove (ctx , serviceID )
560558}
561559
562- func (d * DryRunClient ) ServiceUpdate (ctx context.Context , serviceID string , version swarm.Version , service swarm.ServiceSpec , options swarm .ServiceUpdateOptions ) (swarm.ServiceUpdateResponse , error ) {
563- return d .apiClient .ServiceUpdate (ctx , serviceID , version , service , options )
560+ func (d * DryRunClient ) ServiceUpdate (ctx context.Context , serviceID string , version swarm.Version , spec swarm.ServiceSpec , options client .ServiceUpdateOptions ) (swarm.ServiceUpdateResponse , error ) {
561+ return d .apiClient .ServiceUpdate (ctx , serviceID , version , spec , options )
564562}
565563
566564func (d * DryRunClient ) ServiceLogs (ctx context.Context , serviceID string , options containerType.LogsOptions ) (io.ReadCloser , error ) {
@@ -575,7 +573,7 @@ func (d *DryRunClient) TaskInspectWithRaw(ctx context.Context, taskID string) (s
575573 return d .apiClient .TaskInspectWithRaw (ctx , taskID )
576574}
577575
578- func (d * DryRunClient ) TaskList (ctx context.Context , options swarm .TaskListOptions ) ([]swarm.Task , error ) {
576+ func (d * DryRunClient ) TaskList (ctx context.Context , options client .TaskListOptions ) ([]swarm.Task , error ) {
579577 return d .apiClient .TaskList (ctx , options )
580578}
581579
@@ -603,11 +601,11 @@ func (d *DryRunClient) SwarmInspect(ctx context.Context) (swarm.Swarm, error) {
603601 return d .apiClient .SwarmInspect (ctx )
604602}
605603
606- func (d * DryRunClient ) SwarmUpdate (ctx context.Context , version swarm.Version , swarmSpec swarm.Spec , flags swarm. UpdateFlags ) error {
604+ func (d * DryRunClient ) SwarmUpdate (ctx context.Context , version swarm.Version , swarmSpec swarm.Spec , flags client. SwarmUpdateFlags ) error {
607605 return d .apiClient .SwarmUpdate (ctx , version , swarmSpec , flags )
608606}
609607
610- func (d * DryRunClient ) SecretList (ctx context.Context , options swarm .SecretListOptions ) ([]swarm.Secret , error ) {
608+ func (d * DryRunClient ) SecretList (ctx context.Context , options client .SecretListOptions ) ([]swarm.Secret , error ) {
611609 return d .apiClient .SecretList (ctx , options )
612610}
613611
@@ -627,7 +625,7 @@ func (d *DryRunClient) SecretUpdate(ctx context.Context, id string, version swar
627625 return d .apiClient .SecretUpdate (ctx , id , version , secret )
628626}
629627
630- func (d * DryRunClient ) Events (ctx context.Context , options events. ListOptions ) (<- chan events.Message , <- chan error ) {
628+ func (d * DryRunClient ) Events (ctx context.Context , options client. EventsListOptions ) (<- chan events.Message , <- chan error ) {
631629 return d .apiClient .Events (ctx , options )
632630}
633631
@@ -639,7 +637,7 @@ func (d *DryRunClient) RegistryLogin(ctx context.Context, auth registry.AuthConf
639637 return d .apiClient .RegistryLogin (ctx , auth )
640638}
641639
642- func (d * DryRunClient ) DiskUsage (ctx context.Context , options system .DiskUsageOptions ) (system.DiskUsage , error ) {
640+ func (d * DryRunClient ) DiskUsage (ctx context.Context , options client .DiskUsageOptions ) (system.DiskUsage , error ) {
643641 return d .apiClient .DiskUsage (ctx , options )
644642}
645643
@@ -655,7 +653,7 @@ func (d *DryRunClient) VolumeInspectWithRaw(ctx context.Context, volumeID string
655653 return d .apiClient .VolumeInspectWithRaw (ctx , volumeID )
656654}
657655
658- func (d * DryRunClient ) VolumeList (ctx context.Context , opts volume. ListOptions ) (volume.ListResponse , error ) {
656+ func (d * DryRunClient ) VolumeList (ctx context.Context , opts client. VolumeListOptions ) (volume.ListResponse , error ) {
659657 return d .apiClient .VolumeList (ctx , opts )
660658}
661659
0 commit comments