Skip to content

fix: support podman volatile-containers.json and/or containers.json #3726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: support podman volatile-containers.json and/or containers.json #3726

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4599be
feat: support podman volatile containers
savely-krasovsky May 10, 2025
039ded0
Fix early return when containers.json does not exist.
sirno Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions container/podman/fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ import (
"github.com/google/cadvisor/container/docker"
)

const (
containersJSONFilename = "containers.json"
)
var containersJsonFilnames = []string{
"containers.json",
"volatile-containers.json",
}

type containersJSON struct {
ID string `json:"id"`
Expand All @@ -34,14 +35,26 @@ type containersJSON struct {
}

func rwLayerID(storageDriver docker.StorageDriver, storageDir string, containerID string) (string, error) {
data, err := os.ReadFile(filepath.Join(storageDir, string(storageDriver)+"-containers", containersJSONFilename))
if err != nil {
return "", err
}
var containers []containersJSON
err = json.Unmarshal(data, &containers)
if err != nil {
return "", err

for _, filename := range containersJsonFilnames {
data, err := os.ReadFile(filepath.Join(storageDir, string(storageDriver)+"-containers", filename))
if err != nil && !os.IsNotExist(err) {
return "", err
}

if data != nil {
var buffer []containersJSON
err = json.Unmarshal(data, &buffer)
if err != nil {
return "", err
}
containers = append(containers, buffer...)
}
}

if len(containers) == 0 {
return "", fmt.Errorf("no containers found in containers.json or volatile-containers.json in %q", filepath.Join(storageDir, string(storageDriver)+"-containers"))
}

for _, c := range containers {
Expand Down