mirror of
https://github.com/containers/podman.git
synced 2026-03-13 08:01:19 +08:00
podman info: remove storage.conf path
Given the new config file logic will read many files pritning one specific one here has no meaning anymore, just delete it. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
@@ -144,7 +144,6 @@ registries:
|
||||
- docker.io
|
||||
- quay.io
|
||||
store:
|
||||
configFile: /home/dwalsh/.config/containers/storage.conf
|
||||
containerStore:
|
||||
number: 9
|
||||
paused: 0
|
||||
|
||||
@@ -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"`
|
||||
|
||||
@@ -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(),
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user