tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9998 from glours/display-engine-warnings

Browse Source 
display creation warnings from the engine
This commit is contained in:
Guillaume Lours 2022-11-21 15:17:26 +01:00 committed by GitHub
commit 02818ba6c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/compose/convergence.go
View File

@ -405,7 +405,7 @@ func (s *composeService) createContainer(ctx context.Context, project *types.Pro
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
eventName := "Container " + name eventName := "Container " + name
w.Event(progress.CreatingEvent(eventName)) w.Event(progress.CreatingEvent(eventName))
container, err = s.createMobyContainer(ctx, project, service, name, number, nil, autoRemove, useNetworkAliases, attachStdin) container, err = s.createMobyContainer(ctx, project, service, name, number, nil, autoRemove, useNetworkAliases, attachStdin, w)
if err != nil { if err != nil {
return return
} }
@ -439,7 +439,7 @@ func (s *composeService) recreateContainer(ctx context.Context, project *types.P
inherited = &replaced inherited = &replaced
} }
name = getContainerName(project.Name, service, number) name = getContainerName(project.Name, service, number)
created, err = s.createMobyContainer(ctx, project, service, name, number, inherited, false, true, false) created, err = s.createMobyContainer(ctx, project, service, name, number, inherited, false, true, false, w)
if err != nil { if err != nil {
return created, err return created, err
} }
@ -477,7 +477,7 @@ func (s *composeService) startContainer(ctx context.Context, container moby.Cont
} }
func (s *composeService) createMobyContainer(ctx context.Context, project *types.Project, service types.ServiceConfig, func (s *composeService) createMobyContainer(ctx context.Context, project *types.Project, service types.ServiceConfig,
name string, number int, inherit *moby.Container, autoRemove bool, useNetworkAliases bool, attachStdin bool) (moby.Container, error) { name string, number int, inherit *moby.Container, autoRemove bool, useNetworkAliases bool, attachStdin bool, w progress.Writer) (moby.Container, error) {
var created moby.Container var created moby.Container
containerConfig, hostConfig, networkingConfig, err := s.getCreateOptions(ctx, project, service, number, inherit, autoRemove, attachStdin) containerConfig, hostConfig, networkingConfig, err := s.getCreateOptions(ctx, project, service, number, inherit, autoRemove, attachStdin)
if err != nil { if err != nil {
@ -496,6 +496,13 @@ func (s *composeService) createMobyContainer(ctx context.Context, project *types
if err != nil { if err != nil {
return created, err return created, err
} }
for _, warning := range response.Warnings {
w.Event(progress.Event{
ID: service.Name,
Status: progress.Warning,
Text: warning,
})
}
inspectedContainer, err := s.apiClient().ContainerInspect(ctx, response.ID) inspectedContainer, err := s.apiClient().ContainerInspect(ctx, response.ID)
if err != nil { if err != nil {
return created, err return created, err