opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5974 from giuseppe/fix-init

Browse Source 
[v2] containers, init: skip invalid state errors with --all
This commit is contained in:
OpenShift Merge Robot
2020-04-24 20:33:17 +02:00
committed by GitHub
parent 3c3adac528 bd7cad775a
commit a49d5c9c2f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/domain/infra/abi/containers.go
View File

@ -837,7 +837,13 @@ func (ic *ContainerEngine) ContainerInit(ctx context.Context, namesOrIds []strin
} }
for _, ctr := range ctrs { for _, ctr := range ctrs {
report := entities.ContainerInitReport{Id: ctr.ID()} report := entities.ContainerInitReport{Id: ctr.ID()}
report.Err = ctr.Init(ctx) err := ctr.Init(ctx)
// If we're initializing all containers, ignore invalid state errors
if options.All && errors.Cause(err) == define.ErrCtrStateInvalid {
err = nil
}
report.Err = err
reports = append(reports, &report) reports = append(reports, &report)
} }
return reports, nil return reports, nil

1
test/e2e/init_test.go
View File

@ -16,7 +16,6 @@ var _ = Describe("Podman init", func() {
) )
BeforeEach(func() { BeforeEach(func() {
Skip(v2fail)
tempdir, err = CreateTempDirInTempDir() tempdir, err = CreateTempDirInTempDir()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)