containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15799 from mheon/fix_2126697 

Ensure that a broken OCI spec does not break inspect
This commit is contained in:
OpenShift Merge Robot 2022-09-14 21:55:13 +02:00 committed by GitHub
parent bb4872e2f6 42937cd9a8
commit 4fc18d07a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container.go
View File

@ -356,7 +356,9 @@ func (c *Container) specFromState() (*spec.Spec, error) {
return nil, fmt.Errorf("reading container config: %w", err)
}
if err := json.Unmarshal(content, &returnSpec); err != nil {
return nil, fmt.Errorf("unmarshalling container config: %w", err)
// Malformed spec, just use c.config.Spec instead
logrus.Warnf("Error unmarshalling container %s config: %v", c.ID(), err)
return c.config.Spec, nil
}
} else if !os.IsNotExist(err) {
// ignore when the file does not exist