opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 01:27:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix podman info with multiple imagestores

Browse Source 
The command `podman info` returned only one imagestore in
`store.graphOptions.<driver>.imagestore` even if multiple
image stores were configured.

This change replaces the field `<driver>.imagestore` with
the field `<driver>.additionalImageStores`, that instead
of a string is an array of strings and that includes all
the configured additional image stores.

Fix https://github.com/containers/storage/issues/2094

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
This commit is contained in:
Mario Loriedo
2024-11-29 16:28:47 +00:00
parent b3c02684fd
commit 0d3a653c30
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libpod/info.go
View File

@ -250,7 +250,8 @@ func (r *Runtime) storeInfo() (*define.StoreInfo, error) {
graphOptions := map[string]interface{}{} graphOptions := map[string]interface{}{}
for _, o := range r.store.GraphOptions() { for _, o := range r.store.GraphOptions() {
split := strings.SplitN(o, "=", 2) split := strings.SplitN(o, "=", 2)
if strings.HasSuffix(split[0], "mount_program") { switch {
case strings.HasSuffix(split[0], "mount_program"):
ver, err := version.Program(split[1]) ver, err := version.Program(split[1])
if err != nil { if err != nil {
logrus.Warnf("Failed to retrieve program version for %s: %v", split[1], err) logrus.Warnf("Failed to retrieve program version for %s: %v", split[1], err)
@ -260,7 +261,17 @@ func (r *Runtime) storeInfo() (*define.StoreInfo, error) {
program["Version"] = ver program["Version"] = ver
program["Package"] = version.Package(split[1]) program["Package"] = version.Package(split[1])
graphOptions[split[0]] = program graphOptions[split[0]] = program
} else { case strings.HasSuffix(split[0], "imagestore"):
key := strings.ReplaceAll(split[0], "imagestore", "additionalImageStores")
if graphOptions[key] == nil {
graphOptions[key] = []string{split[1]}
} else {
graphOptions[key] = append(graphOptions[key].([]string), split[1])
}
// Fallthrough to include the `imagestore` key to avoid breaking
// Podman v5 API. Should be removed in Podman v6.0.0.
fallthrough
default:
graphOptions[split[0]] = split[1] graphOptions[split[0]] = split[1]
} }
} }

13
test/system/005-info.bats
View File

@ -182,6 +182,19 @@ host.slirp4netns.executable | $expr_path
is "$output" ".*graphOptions: {}" "output includes graphOptions: {}" is "$output" ".*graphOptions: {}" "output includes graphOptions: {}"
} }
@test "podman info - additional image stores" {
skip_if_remote "--storage-opt flag is not supported for remote"
driver=$(podman_storage_driver)
store1=$PODMAN_TMPDIR/store1
store2=$PODMAN_TMPDIR/store2
mkdir -p $store1 $store2
run_podman info --storage-opt=$driver'.imagestore='$store1 \
--storage-opt=$driver'.imagestore='$store2 \
--format '{{index .Store.GraphOptions "'$driver'.additionalImageStores"}}\n{{index .Store.GraphOptions "'$driver'.imagestore"}}'
assert "${lines[0]}" == "["$store1" "$store2"]" "output includes additional image stores"
assert "${lines[1]}" == "$store2" "old imagestore output"
}
@test "podman info netavark " { @test "podman info netavark " {
# Confirm netavark in use when explicitly required by execution environment. # Confirm netavark in use when explicitly required by execution environment.
if [[ "$NETWORK_BACKEND" == "netavark" ]]; then if [[ "$NETWORK_BACKEND" == "netavark" ]]; then