diff --git a/pkg/compose/build.go b/pkg/compose/build.go index 8dacba1ba4..05558164f2 100644 --- a/pkg/compose/build.go +++ b/pkg/compose/build.go @@ -159,11 +159,16 @@ func (s *composeService) build(ctx context.Context, project *types.Project, opti } service := serviceToBuild.service + cw := progress.ContextWriter(ctx) + serviceName := fmt.Sprintf("Service %s", name) + if !buildkitEnabled { + cw.Event(progress.BuildingEvent(serviceName)) id, err := s.doBuildClassic(ctx, project, service, options) if err != nil { return err } + cw.Event(progress.BuiltEvent(serviceName)) builtDigests[getServiceIndex(name)] = id if options.Push { @@ -181,10 +186,12 @@ func (s *composeService) build(ctx context.Context, project *types.Project, opti return err } + cw.Event(progress.BuildingEvent(serviceName)) digest, err := s.doBuildBuildkit(ctx, name, buildOptions, w, nodes) if err != nil { return err } + cw.Event(progress.BuiltEvent(serviceName)) builtDigests[getServiceIndex(name)] = digest return nil diff --git a/pkg/compose/build_buildkit.go b/pkg/compose/build_buildkit.go index b530d463c3..4b28b292dc 100644 --- a/pkg/compose/build_buildkit.go +++ b/pkg/compose/build_buildkit.go @@ -70,11 +70,6 @@ func (s composeService) dryRunBuildResponse(ctx context.Context, name string, op w := progress.ContextWriter(ctx) buildResponse := map[string]*client.SolveResponse{} dryRunUUID := fmt.Sprintf("dryRun-%x", sha1.Sum([]byte(name))) - w.Event(progress.Event{ - ID: " ", - Status: progress.Done, - Text: fmt.Sprintf("build service %s", name), - }) w.Event(progress.Event{ ID: "==>", Status: progress.Done, diff --git a/pkg/progress/event.go b/pkg/progress/event.go index 32dbac6af1..7d38b54bc4 100644 --- a/pkg/progress/event.go +++ b/pkg/progress/event.go @@ -153,6 +153,16 @@ func RemovedEvent(id string) Event { return NewEvent(id, Done, "Removed") } +// BuildingEvent creates a new Building in progress Event +func BuildingEvent(id string) Event { + return NewEvent(id, Working, "Building") +} + +// BuiltEvent creates a new built (done) Event +func BuiltEvent(id string) Event { + return NewEvent(id, Done, "Built") +} + // SkippedEvent creates a new Skipped Event func SkippedEvent(id string, reason string) Event { return Event{