diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-18 11:20:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 11:20:19 -0400 |
| commit | e6b9b3ab227729e72f52ddab94c024174ab8a442 (patch) | |
| tree | 1c1e6c9bd1c595410d179b3ebf9ea868cddb587e /pkg/domain/infra/abi | |
| parent | 2e621aece054e9ba8cd2fb30254c8513e7caf1b6 (diff) | |
| parent | b20619e5b0dfa6c63b25c3fd9a7ae6188bee2b4c (diff) | |
| download | podman-e6b9b3ab227729e72f52ddab94c024174ab8a442.tar.gz podman-e6b9b3ab227729e72f52ddab94c024174ab8a442.tar.bz2 podman-e6b9b3ab227729e72f52ddab94c024174ab8a442.zip | |
Merge pull request #6656 from mheon/recursive_init
Allow recursive dependency start with Init()
Diffstat (limited to 'pkg/domain/infra/abi')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 8e0ffc075..22de28a1c 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -999,7 +999,7 @@ func (ic *ContainerEngine) ContainerInit(ctx context.Context, namesOrIds []strin reports := make([]*entities.ContainerInitReport, 0, len(ctrs)) for _, ctr := range ctrs { report := entities.ContainerInitReport{Id: ctr.ID()} - err := ctr.Init(ctx) + err := ctr.Init(ctx, ctr.PodID() != "") // If we're initializing all containers, ignore invalid state errors if options.All && errors.Cause(err) == define.ErrCtrStateInvalid { |