docker
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

report error (re)creating container 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2025-05-21 15:25:04 +02:00 committed by Nicolas De loof
parent 5c74f07991
commit cc50ada725
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/compose/convergence.go
View File

@ -595,6 +595,13 @@ func (s *composeService) createContainer(ctx context.Context, project *types.Pro
w.Event(progress.CreatingEvent(eventName)) w.Event(progress.CreatingEvent(eventName))
ctr, err = s.createMobyContainer(ctx, project, service, name, number, nil, opts, w) ctr, err = s.createMobyContainer(ctx, project, service, name, number, nil, opts, w)
if err != nil { if err != nil {
if ctx.Err() == nil {
w.Event(progress.Event{
ID: eventName,
Status: progress.Error,
StatusText: err.Error(),
})
}
return return
} }
w.Event(progress.CreatedEvent(eventName)) w.Event(progress.CreatedEvent(eventName))
@ -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, func (s *composeService) recreateContainer(ctx context.Context, project *types.Project, service types.ServiceConfig,
replaced containerType.Summary, inherit bool, timeout *time.Duration, replaced containerType.Summary, inherit bool, timeout *time.Duration,
) (containerType.Summary, error) { ) (created containerType.Summary, err error) {
var created containerType.Summary
w := progress.ContextWriter(ctx) 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]) number, err := strconv.Atoi(replaced.Labels[api.ContainerNumberLabel])
if err != nil { if err != nil {
@ -646,7 +662,7 @@ func (s *composeService) recreateContainer(ctx context.Context, project *types.P
return created, err return created, err
} }
w.Event(progress.NewEvent(getContainerProgressName(replaced), progress.Done, "Recreated")) w.Event(progress.NewEvent(eventName, progress.Done, "Recreated"))
return created, err return created, err
} }

1
pkg/compose/pull.go
View File

@ -208,7 +208,6 @@ func (s *composeService) pullServiceImage(ctx context.Context, service types.Ser
w.Event(progress.Event{ w.Event(progress.Event{
ID: service.Name, ID: service.Name,
Status: progress.Warning, Status: progress.Warning,
Text: "Warning",
StatusText: "Interrupted", StatusText: "Interrupted",
}) })
return "", nil return "", nil