summaryrefslogtreecommitdiff
path: root/libpod/define
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2021-01-12 11:48:53 -0500
committerMatthew Heon <mheon@redhat.com>2021-01-12 11:48:53 -0500
commitbefd40b57d4e99cccd32ba6867a85c1da816fe5e (patch)
tree694513c032cffd4180838566f5f307045cf44bfc /libpod/define
parent1b9366d650200d0f2029d628fa00d1fd318631aa (diff)
downloadpodman-befd40b57d4e99cccd32ba6867a85c1da816fe5e.tar.gz
podman-befd40b57d4e99cccd32ba6867a85c1da816fe5e.tar.bz2
podman-befd40b57d4e99cccd32ba6867a85c1da816fe5e.zip
Exorcise Driver code from libpod/define
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>
Diffstat (limited to 'libpod/define')
-rw-r--r--libpod/define/container_inspect.go9
1 files changed, 7 insertions, 2 deletions
diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go
index c61f7c159..9a93e2ffd 100644
--- a/libpod/define/container_inspect.go
+++ b/libpod/define/container_inspect.go
@@ -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"`
+}