mirror of https://github.com/docker/compose.git
use compose service methods when exist instead of directly service.dockerCli
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
This commit is contained in:
parent
8c07fa4d25
commit
5a2b7b83cd
|
@ -86,7 +86,7 @@ func (s *composeService) attachContainer(ctx context.Context, container moby.Con
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
inspect, err := s.dockerCli.Client().ContainerInspect(ctx, container.ID)
|
inspect, err := s.apiClient().ContainerInspect(ctx, container.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -235,7 +235,7 @@ func (s *composeService) pullServiceImage(ctx context.Context, service types.Ser
|
||||||
Text: "Pulled",
|
Text: "Pulled",
|
||||||
})
|
})
|
||||||
|
|
||||||
inspected, _, err := s.dockerCli.Client().ImageInspectWithRaw(ctx, service.Image)
|
inspected, _, err := s.apiClient().ImageInspectWithRaw(ctx, service.Image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,7 +56,7 @@ func (s *composeService) prepareRun(ctx context.Context, project *types.Project,
|
||||||
|
|
||||||
applyRunOptions(project, &service, opts)
|
applyRunOptions(project, &service, opts)
|
||||||
|
|
||||||
if err := s.dockerCli.In().CheckTty(opts.Interactive, service.Tty); err != nil {
|
if err := s.stdin().CheckTty(opts.Interactive, service.Tty); err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue