opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-14 01:35:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Exorcise Driver code from libpod/define

Browse Source 
The libpod/define code should not import any large dependencies,
as it is intended to be structures and definitions only. It
included the libpod/driver package for information on the storage
driver, though, which brought in all of c/storage. Split the
driver package so that define has the struct, and thus does not
need to import Driver. And simplify the driver code while we're
at it.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon
2021-01-12 11:48:53 -05:00
parent 1b9366d650
commit befd40b57d
5 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/define/container_inspect.go
View File

@ -4,7 +4,6 @@ import (
"time"
"github.com/containers/image/v5/manifest"
"github.com/containers/podman/v2/libpod/driver"
)
// InspectContainerConfig holds further data about how a container was initially
@ -635,7 +634,7 @@ type InspectContainerData struct {
EffectiveCaps []string `json:"EffectiveCaps"`
BoundingCaps []string `json:"BoundingCaps"`
ExecIDs []string `json:"ExecIDs"`
GraphDriver *driver.Data `json:"GraphDriver"`
GraphDriver *DriverData `json:"GraphDriver"`
SizeRw *int64 `json:"SizeRw,omitempty"`
SizeRootFs int64 `json:"SizeRootFs,omitempty"`
Mounts []InspectMount `json:"Mounts"`
@ -700,3 +699,9 @@ type InspectExecProcess struct {
// User is the user the exec session was started as.
User string `json:"user"`
}
// DriverData handles the data for a storage driver
type DriverData struct {
Name string `json:"Name"`
Data map[string]string `json:"Data"`
}