Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-04 14:47:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge 9ec70b4604 into e87f7b79df

Browse source
This commit is contained in:
oab24413gmai 2026-06-25 15:05:06 +00:00 • committed by GitHub
commit fe24acedb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/compose/convergence.go
View file

@ -154,7 +154,7 @@ func containerReasonEvents(containers Containers, eventFunc func(string, string)
const ServiceConditionRunningOrHealthy = "running_or_healthy"
//nolint:gocyclo
func (s *composeService) waitDependencies(ctx context.Context, project *types.Project, dependant string, dependencies types.DependsOnConfig, containers Containers, timeout time.Duration) error {
func (s *composeService) waitDependencies(ctx context.Context, project *types.Project, dependent string, dependencies types.DependsOnConfig, containers Containers, timeout time.Duration) error {
if timeout > 0 {
withTimeout, cancelFunc := context.WithTimeout(ctx, timeout)
defer cancelFunc()
@ -172,9 +172,9 @@ func (s *composeService) waitDependencies(ctx context.Context, project *types.Pr
s.events.On(containerEvents(waitingFor, waiting)...)
if len(waitingFor) == 0 {
if config.Required {
return fmt.Errorf("%s is missing dependency %s", dependant, dep)
return fmt.Errorf("%s is missing dependency %s", dependent, dep)
}
logrus.Warnf("%s is missing dependency %s", dependant, dep)
logrus.Warnf("%s is missing dependency %s", dependent, dep)
continue
}