diff --git a/docs/source/markdown/podman-info.1.md b/docs/source/markdown/podman-info.1.md index 69275996dd..9892a6e8e2 100644 --- a/docs/source/markdown/podman-info.1.md +++ b/docs/source/markdown/podman-info.1.md @@ -144,7 +144,6 @@ registries: - docker.io - quay.io store: - configFile: /home/dwalsh/.config/containers/storage.conf containerStore: number: 9 paused: 0 diff --git a/libpod/define/info.go b/libpod/define/info.go index 2162a33f05..668ba1b46f 100644 --- a/libpod/define/info.go +++ b/libpod/define/info.go @@ -123,7 +123,6 @@ type OCIRuntimeInfo struct { // StoreInfo describes the container storage and its // attributes type StoreInfo struct { - ConfigFile string `json:"configFile"` ContainerStore ContainerStore `json:"containerStore"` GraphDriverName string `json:"graphDriverName"` GraphOptions map[string]any `json:"graphOptions"` diff --git a/libpod/info.go b/libpod/info.go index 7e1a8366ce..f8dfdbecf7 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -22,7 +22,6 @@ import ( "github.com/sirupsen/logrus" "go.podman.io/common/pkg/version" "go.podman.io/image/v5/pkg/sysregistriesv2" - "go.podman.io/storage" "go.podman.io/storage/pkg/system" ) @@ -213,10 +212,6 @@ func (r *Runtime) getContainerStoreInfo() (define.ContainerStore, error) { // top-level "store" info func (r *Runtime) storeInfo() (*define.StoreInfo, error) { // let's say storage driver in use, number of images, number of containers - configFile, err := storage.DefaultConfigFile() - if err != nil { - return nil, err - } images, err := r.store.Images() if err != nil { return nil, fmt.Errorf("getting number of images: %w", err) @@ -244,7 +239,6 @@ func (r *Runtime) storeInfo() (*define.StoreInfo, error) { GraphDriverName: r.store.GraphDriverName(), GraphOptions: nil, VolumePath: r.config.Engine.VolumePath, - ConfigFile: configFile, TransientStore: r.store.TransientStore(), } diff --git a/test/system/005-info.bats b/test/system/005-info.bats index 4f59d4bcca..b7e3971fc5 100644 --- a/test/system/005-info.bats +++ b/test/system/005-info.bats @@ -48,7 +48,6 @@ host.networkBackendInfo | .*dns.*package.* host.ociRuntime.path | $expr_path host.pasta | .*executable.*package.* host.rootlessNetworkCmd | pasta -store.configFile | $expr_path store.graphDriverName | [a-z0-9]\\\+\\\$ store.graphRoot | $expr_path store.imageStore.number | 1