mirror of
https://github.com/docker/compose.git
synced 2025-07-23 13:45:00 +02:00
pkg/compose: stopDependentContainers: rename var that shadowed
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
b27f56eb19
commit
f25fea5e6d
@ -27,20 +27,19 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.opentelemetry.io/otel/attribute"
|
|
||||||
"go.opentelemetry.io/otel/trace"
|
|
||||||
|
|
||||||
"github.com/compose-spec/compose-go/v2/types"
|
"github.com/compose-spec/compose-go/v2/types"
|
||||||
"github.com/containerd/platforms"
|
"github.com/containerd/platforms"
|
||||||
"github.com/docker/compose/v2/internal/tracing"
|
|
||||||
moby "github.com/docker/docker/api/types"
|
moby "github.com/docker/docker/api/types"
|
||||||
containerType "github.com/docker/docker/api/types/container"
|
containerType "github.com/docker/docker/api/types/container"
|
||||||
mmount "github.com/docker/docker/api/types/mount"
|
mmount "github.com/docker/docker/api/types/mount"
|
||||||
"github.com/docker/docker/api/types/versions"
|
"github.com/docker/docker/api/types/versions"
|
||||||
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"go.opentelemetry.io/otel/attribute"
|
||||||
|
"go.opentelemetry.io/otel/trace"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
|
|
||||||
|
"github.com/docker/compose/v2/internal/tracing"
|
||||||
"github.com/docker/compose/v2/pkg/api"
|
"github.com/docker/compose/v2/pkg/api"
|
||||||
"github.com/docker/compose/v2/pkg/progress"
|
"github.com/docker/compose/v2/pkg/progress"
|
||||||
"github.com/docker/compose/v2/pkg/utils"
|
"github.com/docker/compose/v2/pkg/utils"
|
||||||
@ -240,12 +239,12 @@ func (c *convergence) stopDependentContainers(ctx context.Context, project *type
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, name := range dependents {
|
for _, name := range dependents {
|
||||||
dependents := c.getObservedState(name)
|
dependentStates := c.getObservedState(name)
|
||||||
for i, dependent := range dependents {
|
for i, dependent := range dependentStates {
|
||||||
dependent.State = ContainerExited
|
dependent.State = ContainerExited
|
||||||
dependents[i] = dependent
|
dependentStates[i] = dependent
|
||||||
}
|
}
|
||||||
c.setObservedState(name, dependents)
|
c.setObservedState(name, dependentStates)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user