summaryrefslogtreecommitdiff
path: root/libpod/image/image.go
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/image/image.go
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/image/image.go')
-rw-r--r--libpod/image/image.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go
index a9082b2c6..b79ca1a58 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -30,6 +30,7 @@ import (
"github.com/containers/image/v5/transports"
"github.com/containers/image/v5/transports/alltransports"
"github.com/containers/image/v5/types"
+ "github.com/containers/podman/v2/libpod/define"
"github.com/containers/podman/v2/libpod/driver"
"github.com/containers/podman/v2/libpod/events"
"github.com/containers/podman/v2/pkg/inspect"
@@ -972,7 +973,7 @@ func (i *Image) toImageRef(ctx context.Context) (types.Image, error) {
}
// DriverData gets the driver data from the store on a layer
-func (i *Image) DriverData() (*driver.Data, error) {
+func (i *Image) DriverData() (*define.DriverData, error) {
return driver.GetDriverData(i.imageruntime.store, i.TopLayer())
}