From d127cac6d433ab1031169f3ae4467b03bf02e596 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Mon, 14 Dec 2020 17:55:55 +0100 Subject: [PATCH] Ensure images exist before starting progress display for network / volumes, otherwise progress display is all mixed up Signed-off-by: Guillaume Tardif --- local/compose/run.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/local/compose/run.go b/local/compose/run.go index 189a0ecd0..065efcb8f 100644 --- a/local/compose/run.go +++ b/local/compose/run.go @@ -30,8 +30,11 @@ import ( ) func (s *composeService) CreateOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) (string, error) { - name := opts.Name - service, err := project.GetService(name) + service, err := project.GetService(opts.Name) + if err != nil { + return "", err + } + err = s.ensureImagesExists(ctx, project) if err != nil { return "", err } @@ -133,12 +136,7 @@ func updateOneOffServiceConfig(service *types.ServiceConfig, projectName string, } func (s *composeService) ensureRequiredServices(ctx context.Context, project *types.Project, service types.ServiceConfig) error { - err := s.ensureImagesExists(ctx, project) - if err != nil { - return err - } - - err = InDependencyOrder(ctx, project, func(c context.Context, svc types.ServiceConfig) error { + err := InDependencyOrder(ctx, project, func(c context.Context, svc types.ServiceConfig) error { if svc.Name != service.Name { // only start dependencies, not service to run one-off return s.ensureService(c, project, svc) }