@@ -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 : "running" , // 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 : "running" , // needed for --wait option
135+ Health : & containerType.Health {
136+ Status : containerType .Healthy , // needed for healthcheck control
139137 },
140138 },
141139 Mounts : nil ,
@@ -246,15 +244,15 @@ func (d *DryRunClient) ImageInspectWithRaw(ctx context.Context, imageName string
246244 return resp , buf .Bytes (), err
247245}
248246
249- func (d * DryRunClient ) ImagePull (ctx context.Context , ref string , options image. PullOptions ) (io.ReadCloser , error ) {
247+ func (d * DryRunClient ) ImagePull (ctx context.Context , ref string , options client. ImagePullOptions ) (io.ReadCloser , error ) {
250248 if _ , _ , err := d .resolver .Resolve (ctx , ref ); err != nil {
251249 return nil , err
252250 }
253251 rc := io .NopCloser (strings .NewReader ("" ))
254252 return rc , nil
255253}
256254
257- func (d * DryRunClient ) ImagePush (ctx context.Context , ref string , options image. PushOptions ) (io.ReadCloser , error ) {
255+ func (d * DryRunClient ) ImagePush (ctx context.Context , ref string , options client. ImagePushOptions ) (io.ReadCloser , error ) {
258256 if _ , _ , err := d .resolver .Resolve (ctx , ref ); err != nil {
259257 return nil , err
260258 }
@@ -280,15 +278,15 @@ func (d *DryRunClient) ImagePush(ctx context.Context, ref string, options image.
280278 return rc , nil
281279}
282280
283- func (d * DryRunClient ) ImageRemove (ctx context.Context , imageName string , options image. RemoveOptions ) ([]image.DeleteResponse , error ) {
281+ func (d * DryRunClient ) ImageRemove (ctx context.Context , imageName string , options client. ImageRemoveOptions ) ([]image.DeleteResponse , error ) {
284282 return nil , nil
285283}
286284
287285func (d * DryRunClient ) NetworkConnect (ctx context.Context , networkName , container string , config * network.EndpointSettings ) error {
288286 return nil
289287}
290288
291- func (d * DryRunClient ) NetworkCreate (ctx context.Context , name string , options network. CreateOptions ) (network.CreateResponse , error ) {
289+ func (d * DryRunClient ) NetworkCreate (ctx context.Context , name string , options client. NetworkCreateOptions ) (network.CreateResponse , error ) {
292290 return network.CreateResponse {
293291 ID : name ,
294292 Warning : "" ,
@@ -342,7 +340,7 @@ func (d *DryRunClient) ContainerExecStart(ctx context.Context, execID string, co
342340
343341// Functions delegated to original APIClient (not used by Compose or not modifying the Compose stack
344342
345- func (d * DryRunClient ) ConfigList (ctx context.Context , options swarm .ConfigListOptions ) ([]swarm.Config , error ) {
343+ func (d * DryRunClient ) ConfigList (ctx context.Context , options client .ConfigListOptions ) ([]swarm.Config , error ) {
346344 return d .apiClient .ConfigList (ctx , options )
347345}
348346
@@ -378,7 +376,7 @@ func (d *DryRunClient) ContainerExecInspect(ctx context.Context, execID string)
378376 return d .apiClient .ContainerExecInspect (ctx , execID )
379377}
380378
381- func (d * DryRunClient ) ContainerExecResize (ctx context.Context , execID string , options containerType. ResizeOptions ) error {
379+ func (d * DryRunClient ) ContainerExecResize (ctx context.Context , execID string , options client. ContainerResizeOptions ) error {
382380 return d .apiClient .ContainerExecResize (ctx , execID , options )
383381}
384382
@@ -394,7 +392,7 @@ func (d *DryRunClient) ContainerLogs(ctx context.Context, container string, opti
394392 return d .apiClient .ContainerLogs (ctx , container , options )
395393}
396394
397- func (d * DryRunClient ) ContainerResize (ctx context.Context , container string , options containerType. ResizeOptions ) error {
395+ func (d * DryRunClient ) ContainerResize (ctx context.Context , container string , options client. ContainerResizeOptions ) error {
398396 return d .apiClient .ContainerResize (ctx , container , options )
399397}
400398
@@ -438,27 +436,27 @@ func (d *DryRunClient) BuildCancel(ctx context.Context, id string) error {
438436 return d .apiClient .BuildCancel (ctx , id )
439437}
440438
441- func (d * DryRunClient ) ImageCreate (ctx context.Context , parentReference string , options image. CreateOptions ) (io.ReadCloser , error ) {
439+ func (d * DryRunClient ) ImageCreate (ctx context.Context , parentReference string , options client. ImageCreateOptions ) (io.ReadCloser , error ) {
442440 return d .apiClient .ImageCreate (ctx , parentReference , options )
443441}
444442
445443func (d * DryRunClient ) ImageHistory (ctx context.Context , imageName string , options ... client.ImageHistoryOption ) ([]image.HistoryResponseItem , error ) {
446444 return d .apiClient .ImageHistory (ctx , imageName , options ... )
447445}
448446
449- func (d * DryRunClient ) ImageImport (ctx context.Context , source image. ImportSource , ref string , options image. ImportOptions ) (io.ReadCloser , error ) {
447+ func (d * DryRunClient ) ImageImport (ctx context.Context , source client. ImageImportSource , ref string , options client. ImageImportOptions ) (io.ReadCloser , error ) {
450448 return d .apiClient .ImageImport (ctx , source , ref , options )
451449}
452450
453- func (d * DryRunClient ) ImageList (ctx context.Context , options image. ListOptions ) ([]image.Summary , error ) {
451+ func (d * DryRunClient ) ImageList (ctx context.Context , options client. ImageListOptions ) ([]image.Summary , error ) {
454452 return d .apiClient .ImageList (ctx , options )
455453}
456454
457455func (d * DryRunClient ) ImageLoad (ctx context.Context , input io.Reader , options ... client.ImageLoadOption ) (image.LoadResponse , error ) {
458456 return d .apiClient .ImageLoad (ctx , input , options ... )
459457}
460458
461- func (d * DryRunClient ) ImageSearch (ctx context.Context , term string , options registry. SearchOptions ) ([]registry.SearchResult , error ) {
459+ func (d * DryRunClient ) ImageSearch (ctx context.Context , term string , options client. ImageSearchOptions ) ([]registry.SearchResult , error ) {
462460 return d .apiClient .ImageSearch (ctx , term , options )
463461}
464462
@@ -478,27 +476,27 @@ func (d *DryRunClient) NodeInspectWithRaw(ctx context.Context, nodeID string) (s
478476 return d .apiClient .NodeInspectWithRaw (ctx , nodeID )
479477}
480478
481- func (d * DryRunClient ) NodeList (ctx context.Context , options swarm .NodeListOptions ) ([]swarm.Node , error ) {
479+ func (d * DryRunClient ) NodeList (ctx context.Context , options client .NodeListOptions ) ([]swarm.Node , error ) {
482480 return d .apiClient .NodeList (ctx , options )
483481}
484482
485- func (d * DryRunClient ) NodeRemove (ctx context.Context , nodeID string , options swarm .NodeRemoveOptions ) error {
483+ func (d * DryRunClient ) NodeRemove (ctx context.Context , nodeID string , options client .NodeRemoveOptions ) error {
486484 return d .apiClient .NodeRemove (ctx , nodeID , options )
487485}
488486
489487func (d * DryRunClient ) NodeUpdate (ctx context.Context , nodeID string , version swarm.Version , node swarm.NodeSpec ) error {
490488 return d .apiClient .NodeUpdate (ctx , nodeID , version , node )
491489}
492490
493- func (d * DryRunClient ) NetworkInspect (ctx context.Context , networkName string , options network. InspectOptions ) (network.Inspect , error ) {
491+ func (d * DryRunClient ) NetworkInspect (ctx context.Context , networkName string , options client. NetworkInspectOptions ) (network.Inspect , error ) {
494492 return d .apiClient .NetworkInspect (ctx , networkName , options )
495493}
496494
497- func (d * DryRunClient ) NetworkInspectWithRaw (ctx context.Context , networkName string , options network. InspectOptions ) (network.Inspect , []byte , error ) {
495+ func (d * DryRunClient ) NetworkInspectWithRaw (ctx context.Context , networkName string , options client. NetworkInspectOptions ) (network.Inspect , []byte , error ) {
498496 return d .apiClient .NetworkInspectWithRaw (ctx , networkName , options )
499497}
500498
501- func (d * DryRunClient ) NetworkList (ctx context.Context , options network. ListOptions ) ([]network.Inspect , error ) {
499+ func (d * DryRunClient ) NetworkList (ctx context.Context , options client. NetworkListOptions ) ([]network.Inspect , error ) {
502500 return d .apiClient .NetworkList (ctx , options )
503501}
504502
@@ -546,23 +544,23 @@ func (d *DryRunClient) PluginCreate(ctx context.Context, createContext io.Reader
546544 return d .apiClient .PluginCreate (ctx , createContext , options )
547545}
548546
549- func (d * DryRunClient ) ServiceCreate (ctx context.Context , service swarm.ServiceSpec , options swarm .ServiceCreateOptions ) (swarm.ServiceCreateResponse , error ) {
547+ func (d * DryRunClient ) ServiceCreate (ctx context.Context , service swarm.ServiceSpec , options client .ServiceCreateOptions ) (swarm.ServiceCreateResponse , error ) {
550548 return d .apiClient .ServiceCreate (ctx , service , options )
551549}
552550
553- func (d * DryRunClient ) ServiceInspectWithRaw (ctx context.Context , serviceID string , options swarm .ServiceInspectOptions ) (swarm.Service , []byte , error ) {
551+ func (d * DryRunClient ) ServiceInspectWithRaw (ctx context.Context , serviceID string , options client .ServiceInspectOptions ) (swarm.Service , []byte , error ) {
554552 return d .apiClient .ServiceInspectWithRaw (ctx , serviceID , options )
555553}
556554
557- func (d * DryRunClient ) ServiceList (ctx context.Context , options swarm .ServiceListOptions ) ([]swarm.Service , error ) {
555+ func (d * DryRunClient ) ServiceList (ctx context.Context , options client .ServiceListOptions ) ([]swarm.Service , error ) {
558556 return d .apiClient .ServiceList (ctx , options )
559557}
560558
561559func (d * DryRunClient ) ServiceRemove (ctx context.Context , serviceID string ) error {
562560 return d .apiClient .ServiceRemove (ctx , serviceID )
563561}
564562
565- func (d * DryRunClient ) ServiceUpdate (ctx context.Context , serviceID string , version swarm.Version , service swarm.ServiceSpec , options swarm .ServiceUpdateOptions ) (swarm.ServiceUpdateResponse , error ) {
563+ func (d * DryRunClient ) ServiceUpdate (ctx context.Context , serviceID string , version swarm.Version , service swarm.ServiceSpec , options client .ServiceUpdateOptions ) (swarm.ServiceUpdateResponse , error ) {
566564 return d .apiClient .ServiceUpdate (ctx , serviceID , version , service , options )
567565}
568566
@@ -578,7 +576,7 @@ func (d *DryRunClient) TaskInspectWithRaw(ctx context.Context, taskID string) (s
578576 return d .apiClient .TaskInspectWithRaw (ctx , taskID )
579577}
580578
581- func (d * DryRunClient ) TaskList (ctx context.Context , options swarm .TaskListOptions ) ([]swarm.Task , error ) {
579+ func (d * DryRunClient ) TaskList (ctx context.Context , options client .TaskListOptions ) ([]swarm.Task , error ) {
582580 return d .apiClient .TaskList (ctx , options )
583581}
584582
@@ -606,11 +604,11 @@ func (d *DryRunClient) SwarmInspect(ctx context.Context) (swarm.Swarm, error) {
606604 return d .apiClient .SwarmInspect (ctx )
607605}
608606
609- func (d * DryRunClient ) SwarmUpdate (ctx context.Context , version swarm.Version , swarmSpec swarm.Spec , flags swarm. UpdateFlags ) error {
607+ func (d * DryRunClient ) SwarmUpdate (ctx context.Context , version swarm.Version , swarmSpec swarm.Spec , flags client. SwarmUpdateFlags ) error {
610608 return d .apiClient .SwarmUpdate (ctx , version , swarmSpec , flags )
611609}
612610
613- func (d * DryRunClient ) SecretList (ctx context.Context , options swarm .SecretListOptions ) ([]swarm.Secret , error ) {
611+ func (d * DryRunClient ) SecretList (ctx context.Context , options client .SecretListOptions ) ([]swarm.Secret , error ) {
614612 return d .apiClient .SecretList (ctx , options )
615613}
616614
@@ -630,7 +628,7 @@ func (d *DryRunClient) SecretUpdate(ctx context.Context, id string, version swar
630628 return d .apiClient .SecretUpdate (ctx , id , version , secret )
631629}
632630
633- func (d * DryRunClient ) Events (ctx context.Context , options events. ListOptions ) (<- chan events.Message , <- chan error ) {
631+ func (d * DryRunClient ) Events (ctx context.Context , options client. EventsListOptions ) (<- chan events.Message , <- chan error ) {
634632 return d .apiClient .Events (ctx , options )
635633}
636634
@@ -642,7 +640,7 @@ func (d *DryRunClient) RegistryLogin(ctx context.Context, auth registry.AuthConf
642640 return d .apiClient .RegistryLogin (ctx , auth )
643641}
644642
645- func (d * DryRunClient ) DiskUsage (ctx context.Context , options system .DiskUsageOptions ) (system.DiskUsage , error ) {
643+ func (d * DryRunClient ) DiskUsage (ctx context.Context , options client .DiskUsageOptions ) (system.DiskUsage , error ) {
646644 return d .apiClient .DiskUsage (ctx , options )
647645}
648646
@@ -658,7 +656,7 @@ func (d *DryRunClient) VolumeInspectWithRaw(ctx context.Context, volumeID string
658656 return d .apiClient .VolumeInspectWithRaw (ctx , volumeID )
659657}
660658
661- func (d * DryRunClient ) VolumeList (ctx context.Context , opts volume. ListOptions ) (volume.ListResponse , error ) {
659+ func (d * DryRunClient ) VolumeList (ctx context.Context , opts client. VolumeListOptions ) (volume.ListResponse , error ) {
662660 return d .apiClient .VolumeList (ctx , opts )
663661}
664662
0 commit comments