summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg/specgen/generate/container.go42
-rw-r--r--pkg/specgen/generate/container_create.go19
-rw-r--r--pkg/specgen/specgen.go16
3 files changed, 56 insertions, 21 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index d4bd6073e..f126aa018 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -18,19 +18,43 @@ import (
"golang.org/x/sys/unix"
)
+func getImageFromSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerator) (*libimage.Image, string, *libimage.ImageData, error) {
+ if s.Image == "" || s.Rootfs != "" {
+ return nil, "", nil, nil
+ }
+
+ // Image may already have been set in the generator.
+ image, resolvedName := s.GetImage()
+ if image != nil {
+ inspectData, err := image.Inspect(ctx, false)
+ if err != nil {
+ return nil, "", nil, err
+ }
+ return image, resolvedName, inspectData, nil
+ }
+
+ // Need to look up image.
+ image, resolvedName, err := r.LibimageRuntime().LookupImage(s.Image, nil)
+ if err != nil {
+ return nil, "", nil, err
+ }
+ s.SetImage(image, resolvedName)
+ inspectData, err := image.Inspect(ctx, false)
+ if err != nil {
+ return nil, "", nil, err
+ }
+ return image, resolvedName, inspectData, err
+}
+
// Fill any missing parts of the spec generator (e.g. from the image).
// Returns a set of warnings or any fatal error that occurred.
func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerator) ([]string, error) {
// Only add image configuration if we have an image
- var newImage *libimage.Image
- var inspectData *libimage.ImageData
- var err error
- if s.Image != "" {
- newImage, _, err = r.LibimageRuntime().LookupImage(s.Image, nil)
- if err != nil {
- return nil, err
- }
-
+ newImage, _, inspectData, err := getImageFromSpec(ctx, r, s)
+ if err != nil {
+ return nil, err
+ }
+ if inspectData != nil {
inspectData, err = newImage.Inspect(ctx, false)
if err != nil {
return nil, err
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index a50685d0f..92c0f22d9 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -121,20 +121,15 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
options = append(options, libpod.WithCreateCommand(s.ContainerCreateCommand))
}
- var newImage *libimage.Image
- var imageData *libimage.ImageData
if s.Rootfs != "" {
options = append(options, libpod.WithRootFS(s.Rootfs, s.RootfsOverlay))
- } else {
- var resolvedImageName string
- newImage, resolvedImageName, err = rt.LibimageRuntime().LookupImage(s.Image, nil)
- if err != nil {
- return nil, nil, nil, err
- }
- imageData, err = newImage.Inspect(ctx, false)
- if err != nil {
- return nil, nil, nil, err
- }
+ }
+
+ newImage, resolvedImageName, imageData, err := getImageFromSpec(ctx, rt, s)
+ if err != nil {
+ return nil, nil, nil, err
+ }
+ if newImage != nil {
// If the input name changed, we could properly resolve the
// image. Otherwise, it must have been an ID where we're
// defaulting to the first name or an empty one if no names are
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go
index 70b2aa1ef..dbb669291 100644
--- a/pkg/specgen/specgen.go
+++ b/pkg/specgen/specgen.go
@@ -5,6 +5,7 @@ import (
"strings"
"syscall"
+ "github.com/containers/common/libimage"
"github.com/containers/image/v5/manifest"
nettypes "github.com/containers/podman/v3/libpod/network/types"
"github.com/containers/storage/types"
@@ -512,6 +513,21 @@ type SpecGenerator struct {
ContainerNetworkConfig
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
}
type Secret struct {