Skip to content

report error (re)creating container #12859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndeloof merged 1 commit into from
May 21, 2025
+20 −5
Merged

report error (re)creating container #12859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions pkg/compose/convergence.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,13 @@ func (s *composeService) createContainer(ctx context.Context, project *types.Pro
w.Event(progress.CreatingEvent(eventName))
ctr, err = s.createMobyContainer(ctx, project, service, name, number, nil, opts, w)
if err != nil {
if ctx.Err() == nil {
w.Event(progress.Event{
ID: eventName,
Status: progress.Error,
StatusText: err.Error(),
})
}
return
}
w.Event(progress.CreatedEvent(eventName))
Expand All @@ -603,10 +610,19 @@ func (s *composeService) createContainer(ctx context.Context, project *types.Pro

func (s *composeService) recreateContainer(ctx context.Context, project *types.Project, service types.ServiceConfig,
replaced containerType.Summary, inherit bool, timeout *time.Duration,
) (containerType.Summary, error) {
var created containerType.Summary
) (created containerType.Summary, err error) {
w := progress.ContextWriter(ctx)
w.Event(progress.NewEvent(getContainerProgressName(replaced), progress.Working, "Recreate"))
eventName := getContainerProgressName(replaced)
w.Event(progress.NewEvent(eventName, progress.Working, "Recreate"))
defer func() {
if err != nil && ctx.Err() == nil {
w.Event(progress.Event{
ID: eventName,
Status: progress.Error,
StatusText: err.Error(),
})
}
}()

number, err := strconv.Atoi(replaced.Labels[api.ContainerNumberLabel])
if err != nil {
Expand Down Expand Up @@ -646,7 +662,7 @@ func (s *composeService) recreateContainer(ctx context.Context, project *types.P
return created, err
}

w.Event(progress.NewEvent(getContainerProgressName(replaced), progress.Done, "Recreated"))
w.Event(progress.NewEvent(eventName, progress.Done, "Recreated"))
return created, err
}

Expand Down
1 change: 0 additions & 1 deletion pkg/compose/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ func (s *composeService) pullServiceImage(ctx context.Context, service types.Ser
w.Event(progress.Event{
ID: service.Name,
Status: progress.Warning,
Text: "Warning",
StatusText: "Interrupted",
})
return "", nil
Expand Down