diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index 52ddf3d396..12b9e06854 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -6,7 +6,6 @@ import ( "strings" "syscall" - "github.com/containers/common/libimage" nettypes "github.com/containers/common/libnetwork/types" "github.com/containers/image/v5/manifest" "github.com/containers/podman/v4/libpod/define" @@ -570,20 +569,7 @@ type SpecGenerator struct { ContainerResourceConfig ContainerHealthCheckConfig - image *libimage.Image `json:"-"` - resolvedImageName string `json:"-"` -} - -// SetImage sets the associated for the generator. -func (s *SpecGenerator) SetImage(image *libimage.Image, resolvedImageName string) { - s.image = image - s.resolvedImageName = resolvedImageName -} - -// Image returns the associated image for the generator. -// May be nil if no image has been set yet. -func (s *SpecGenerator) GetImage() (*libimage.Image, string) { - return s.image, s.resolvedImageName + cacheLibImage } func (s *SpecGenerator) IsInitContainer() bool { diff --git a/pkg/specgen/specgen_local.go b/pkg/specgen/specgen_local.go new file mode 100644 index 0000000000..9e84249c43 --- /dev/null +++ b/pkg/specgen/specgen_local.go @@ -0,0 +1,23 @@ +//go:build !remote +// +build !remote + +package specgen + +import "github.com/containers/common/libimage" + +type cacheLibImage struct { + image *libimage.Image `json:"-"` + resolvedImageName string `json:"-"` +} + +// SetImage sets the associated for the generator. +func (s *SpecGenerator) SetImage(image *libimage.Image, resolvedImageName string) { + s.image = image + s.resolvedImageName = resolvedImageName +} + +// Image returns the associated image for the generator. +// May be nil if no image has been set yet. +func (s *SpecGenerator) GetImage() (*libimage.Image, string) { + return s.image, s.resolvedImageName +} diff --git a/pkg/specgen/specgen_remote.go b/pkg/specgen/specgen_remote.go new file mode 100644 index 0000000000..d6c6102846 --- /dev/null +++ b/pkg/specgen/specgen_remote.go @@ -0,0 +1,8 @@ +//go:build remote +// +build remote + +package specgen + +// Empty stub we do not use any libimage on the remote client, +// this drastically decreases binary size for the remote client. +type cacheLibImage struct{}