Resolve nested acorn images against local registry

integration/build/build_test.go

@@ -26,9 +26,20 @@ func TestBuildFailed(t *testing.T) {
 }
 
 func TestNestedBuild(t *testing.T) {
+	simple, err := build.Build(helper.GetCTX(t), "./testdata/simple/acorn.cue", &build.Options{
+		Cwd:    "./testdata/simple",
+		Client: helper.BuilderClient(t, system.RequireUserNamespace()),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	image, err := build.Build(helper.GetCTX(t), "./testdata/nested/acorn.cue", &build.Options{
 		Cwd:    "./testdata/nested",
 		Client: helper.BuilderClient(t, system.RequireUserNamespace()),
+		Args: map[string]interface{}{
+			"image": simple.ID,
+		},
 	})
 	if err != nil {
 		t.Fatal(err)

integration/build/testdata/nested/acorn.cue

@@ -1,3 +1,5 @@
+args: build: image: string
+
 acorns: {
 	sub1: {
 		build: "./subdir"
@@ -8,6 +10,7 @@ acorns: {
 			acornfile: "./subdir2/test.cue"
 			buildArgs: {
 				filename: "buildfile"
+				image: args.build.image
 			}
 		}
 	}

integration/build/testdata/nested/subdir2/test.cue

@@ -1,11 +1,11 @@
 args: build: {
 	filename: string
+	image: string
 }
 
 images: bar: build: {
 	context: "./bar"
 	dockerfile: "./bar/\(args.build.filename)"
 }
 
-// busybox is not a proper acorn image, but should work since we don't validate and we know it's an index
-acorns: foo: image: "busybox"
+acorns: foo: image: string

pkg/appdefinition/appdefinition.go

@@ -348,7 +348,7 @@ func AppImageFromTar(reader io.Reader) (*v1.AppImage, error) {
 	}
 
 	if result.Acornfile == "" {
-		return nil, fmt.Errorf("invalid image, empty acorn.cue")
+		return nil, fmt.Errorf("invalid image no acorn.cue found")
 	}
 
 	return result, nil

pkg/build/build.go

@@ -17,6 +17,7 @@ import (
 	"github.com/acorn-io/acorn/pkg/remoteopts"
 	"github.com/acorn-io/acorn/pkg/streams"
 	"github.com/acorn-io/acorn/pkg/system"
+	"github.com/acorn-io/acorn/pkg/tags"
 	"github.com/acorn-io/baaah/pkg/typed"
 	imagename "github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
@@ -193,6 +194,16 @@ func buildAcorns(ctx context.Context, c client.Client, cwd string, platforms []v
 	for _, entry := range typed.Sorted(acorns) {
 		key, acornImage := entry.Key, entry.Value
 		if acornImage.Image != "" {
+			imageDetails, err := c.ImageDetails(ctx, acornImage.Image, nil)
+			if err != nil {
+				return nil, err
+			}
+
+			if tags.SHAPattern.MatchString(imageDetails.AppImage.ID) {
+				// TODO: This is a terrible hack and should be redone once we move builder logic server side
+				acornImage.Image = fmt.Sprintf("127.0.0.1:%d/acorn/%s:%s", system.RegistryPort, c.GetNamespace(), imageDetails.AppImage.ID)
+			}
+
 			tag, err := imagename.ParseReference(acornImage.Image)
 			if err != nil {
 				return nil, err

pkg/client/client.go

@@ -117,7 +117,10 @@ type ImageProgress struct {
 }
 
 type ImageDetails struct {
-	AppImage v1.AppImage `json:"appImage,omitempty"`
+	AppImage   v1.AppImage   `json:"appImage,omitempty"`
+	AppSpec    *v1.AppSpec   `json:"appSpec,omitempty"`
+	Params     *v1.ParamSpec `json:"params,omitempty"`
+	ParseError string        `json:"parseError,omitempty"`
 }
 
 type Client interface {

pkg/client/image.go

@@ -44,7 +44,10 @@ func (c *client) ImageDetails(ctx context.Context, imageName string, opts *Image
 	}
 
 	return &ImageDetails{
-		AppImage: detailsResult.AppImage,
+		AppImage:   detailsResult.AppImage,
+		AppSpec:    detailsResult.AppSpec,
+		Params:     detailsResult.Params,
+		ParseError: detailsResult.ParseError,
 	}, nil
 }
 

pkg/pull/pull.go

@@ -30,7 +30,13 @@ func AppImage(ctx context.Context, c client.Reader, namespace, image string) (*v
 		return nil, err
 	}
 
-	return pullIndex(tag, opts)
+	appImage, err := pullIndex(tag, opts)
+	if err != nil {
+		return nil, err
+	}
+
+	appImage.ID = image
+	return appImage, nil
 }
 
 func pullIndex(tag imagename.Reference, opts []remote.Option) (*v1.AppImage, error) {