Skip to content

Commit f25fea5

Browse files
thaJeztahndeloof
authored andcommitted
pkg/compose: stopDependentContainers: rename var that shadowed
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent b27f56e commit f25fea5

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

pkg/compose/convergence.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,19 @@ import (
2727
"sync"
2828
"time"
2929

30-
"go.opentelemetry.io/otel/attribute"
31-
"go.opentelemetry.io/otel/trace"
32-
3330
"github.com/compose-spec/compose-go/v2/types"
3431
"github.com/containerd/platforms"
35-
"github.com/docker/compose/v2/internal/tracing"
3632
moby "github.com/docker/docker/api/types"
3733
containerType "github.com/docker/docker/api/types/container"
3834
mmount "github.com/docker/docker/api/types/mount"
3935
"github.com/docker/docker/api/types/versions"
4036
specs "github.com/opencontainers/image-spec/specs-go/v1"
4137
"github.com/sirupsen/logrus"
38+
"go.opentelemetry.io/otel/attribute"
39+
"go.opentelemetry.io/otel/trace"
4240
"golang.org/x/sync/errgroup"
4341

42+
"github.com/docker/compose/v2/internal/tracing"
4443
"github.com/docker/compose/v2/pkg/api"
4544
"github.com/docker/compose/v2/pkg/progress"
4645
"github.com/docker/compose/v2/pkg/utils"
@@ -240,12 +239,12 @@ func (c *convergence) stopDependentContainers(ctx context.Context, project *type
240239
}
241240

242241
for _, name := range dependents {
243-
dependents := c.getObservedState(name)
244-
for i, dependent := range dependents {
242+
dependentStates := c.getObservedState(name)
243+
for i, dependent := range dependentStates {
245244
dependent.State = ContainerExited
246-
dependents[i] = dependent
245+
dependentStates[i] = dependent
247246
}
248-
c.setObservedState(name, dependents)
247+
c.setObservedState(name, dependentStates)
249248
}
250249
return nil
251250
}

0 commit comments

Comments
 (0)