dynamically fetching the build directories from images.json

buildpack_integration_test.go

@@ -40,7 +40,7 @@ func testBuildpackIntegration(t *testing.T, context spec.G, it spec.S) {
 		docker = occam.NewDocker()
 	})
 
-	context("When building an app using default stack", func() {
+	context("When building GO app using default stack", func() {
 
 		it.After(func() {
 			Expect(docker.Container.Remove.Execute(container.ID)).To(Succeed())
@@ -67,7 +67,7 @@ func testBuildpackIntegration(t *testing.T, context spec.G, it spec.S) {
 			}
 
 			it("should successfully build a go app", func() {
-				_, runImageUrl, builderImageUrl, err = utils.GenerateBuilder(root, "build", RegistryUrl)
+				_, runImageUrl, builderImageUrl, err = utils.GenerateBuilder(root, stack.OutputDir, RegistryUrl)
 				Expect(err).NotTo(HaveOccurred())
 
 				image, _, err = pack.WithNoColor().Build.
@@ -100,7 +100,7 @@ func testBuildpackIntegration(t *testing.T, context spec.G, it spec.S) {
 		}
 	})
 
-	context("When building an app using Node.js stacks", func() {
+	context("When building a GO app using Node.js stacks", func() {
 
 		it.After(func() {
 			Expect(docker.Container.Remove.Execute(container.ID)).To(Succeed())

init_test.go

@@ -18,6 +18,7 @@ import (
 
 var root string
 var RegistryUrl string
+var DefaultStack StackImages
 
 type StackImages struct {
 	Name                    string `json:"name"`
@@ -121,6 +122,9 @@ func TestAcceptance(t *testing.T) {
 		settings.ImagesJson.StackImages = filteredStacks
 	}
 
+	DefaultStack = getDefaultStack(settings.ImagesJson.StackImages)
+	Expect(DefaultStack).NotTo(Equal(StackImages{}))
+
 	buildpackStore := occam.NewBuildpackStore()
 
 	settings.Extensions.UbiNodejsExtension.Online, err = buildpackStore.Get.
@@ -139,7 +143,11 @@ func TestAcceptance(t *testing.T) {
 		Execute(settings.Config.GoDist)
 	Expect(err).NotTo(HaveOccurred())
 
-	builder.buildImageUrl, builder.runImageUrl, builder.imageUrl, err = utils.GenerateBuilder(root, "build", RegistryUrl)
+	builder.buildImageUrl, builder.runImageUrl, builder.imageUrl, err = utils.GenerateBuilder(
+		root,
+		DefaultStack.OutputDir,
+		RegistryUrl,
+	)
 	Expect(err).NotTo(HaveOccurred())
 
 	SetDefaultEventuallyTimeout(120 * time.Second)
@@ -158,3 +166,12 @@ func TestAcceptance(t *testing.T) {
 	Expect(err).NotTo(HaveOccurred())
 
 }
+
+func getDefaultStack(stackImages []StackImages) StackImages {
+	for _, stack := range stackImages {
+		if stack.Name == "default" {
+			return stack
+		}
+	}
+	return StackImages{}
+}

internal/utils/utils.go

@@ -13,16 +13,16 @@ import (
 	"github.com/paketo-buildpacks/packit/v2/pexec"
 )
 
-func GenerateBuilder(rootDir string, stackPath string, registryUrl string) (buildImageUrl string, runImageUrl string, builderImageUrl string, err error) {
+func GenerateBuilder(rootDir string, outputDir string, registryUrl string) (buildImageUrl string, runImageUrl string, builderImageUrl string, err error) {
 
-	buildArchive := filepath.Join(rootDir, "build", "build.oci")
+	buildArchive := filepath.Join(rootDir, outputDir, "build.oci")
 	buildImageID := fmt.Sprintf("build-image-%s", uuid.NewString())
 	buildImageUrl, err = PushFileToLocalRegistry(buildArchive, registryUrl, buildImageID)
 	if err != nil {
 		return "", "", "", err
 	}
 
-	runArchive := filepath.Join(rootDir, stackPath, "run.oci")
+	runArchive := filepath.Join(rootDir, outputDir, "run.oci")
 	runImageID := fmt.Sprintf("run-image-%s", uuid.NewString())
 	runImageUrl, err = PushFileToLocalRegistry(runArchive, registryUrl, runImageID)
 	if err != nil {

scripts/create.sh

@@ -66,7 +66,8 @@ function main() {
 
   if [ -f "${IMAGES_JSON}" ]; then
     # we need to copy images.json for inclusion in the build image
-    cp $IMAGES_JSON "${ROOT_DIR}/stacks/stack/"
+    defaultStackPath=$(jq -r '.images[] | select(.name == "default") | .config_dir' "${IMAGES_JSON}")
+    cp $IMAGES_JSON $ROOT_DIR/$defaultStackPath/images.json
   fi
 
   # if stack or build argument is provided but not both, then throw an error