update to support docker-in-mem generation (#5916)

* update to support docker-in-mem generation

* cspell fix

* raname variable and replace deprecated function

Author: vhvb1989

cli/azd/pkg/apphost/generate.go

@@ -307,7 +307,7 @@ func BicepTemplate(name string, manifest *Manifest, options AppHostOptions) (*me
 	// use the filesystem coming from the manifest
 	// the in-memory filesystem from the manifest is guaranteed to be initialized and contains all the bicep files
 	// referenced by the Aspire manifest.
-	fs := manifest.BicepFiles
+	fs := manifest.Files
 
 	// bicepContext merges the bicepContext with the inputs from the manifest to execute the main.bicep template
 	// this allows the template to access the auto-gen inputs from the generator

cli/azd/pkg/apphost/manifest.go

@@ -36,8 +36,8 @@ const (
 type Manifest struct {
 	Schema    string               `json:"$schema"`
 	Resources map[string]*Resource `json:"resources"`
-	// BicepFiles holds any bicep files generated by Aspire next to the manifest file.
-	BicepFiles *memfs.FS `json:"-"`
+	// Files holds any files generated by Aspire next to the manifest file.
+	Files *memfs.FS `json:"-"`
 	// publish mode intention from the manifest
 	publishMode apphostPublishMode `json:"-"`
 }
@@ -299,12 +299,12 @@ func ManifestFromAppHost(
 		manifestDir = filepath.Dir(appHostProject)
 	}
 
-	manifest.BicepFiles = memfs.New()
+	manifest.Files = memfs.New()
 
 	for resourceName, res := range manifest.Resources {
 		if res.Path != nil {
 			if res.Type == "azure.bicep.v0" || res.Type == "azure.bicep.v1" {
-				e := manifest.BicepFiles.MkdirAll(resourceName, osutil.PermissionDirectory)
+				e := manifest.Files.MkdirAll(resourceName, osutil.PermissionDirectory)
 				if e != nil {
 					return nil, e
 				}
@@ -318,7 +318,7 @@ func ManifestFromAppHost(
 					}
 				}
 				*res.Path = filepath.Join(resourceName, filepath.Base(*res.Path))
-				e = manifest.BicepFiles.WriteFile(*res.Path, content, osutil.PermissionFile)
+				e = manifest.Files.WriteFile(*res.Path, content, osutil.PermissionFile)
 				if e != nil {
 					return nil, e
 				}
@@ -337,7 +337,7 @@ func ManifestFromAppHost(
 					"unexpected deployment type %q. Supported types: [azure.bicep.v0, azure.bicep.v1]", res.Deployment.Type)
 			}
 			// use a folder with the name of the resource
-			e := manifest.BicepFiles.MkdirAll(resourceName, osutil.PermissionDirectory)
+			e := manifest.Files.MkdirAll(resourceName, osutil.PermissionDirectory)
 			if e != nil {
 				return nil, e
 			}
@@ -346,7 +346,7 @@ func ManifestFromAppHost(
 				return nil, fmt.Errorf("reading bicep file from deployment property: %w", e)
 			}
 			*res.Deployment.Path = filepath.Join(resourceName, filepath.Base(*res.Deployment.Path))
-			e = manifest.BicepFiles.WriteFile(*res.Deployment.Path, content, osutil.PermissionFile)
+			e = manifest.Files.WriteFile(*res.Deployment.Path, content, osutil.PermissionFile)
 			if e != nil {
 				return nil, e
 			}
@@ -372,6 +372,21 @@ func ManifestFromAppHost(
 				if !filepath.IsAbs(res.Build.Context) {
 					res.Build.Context = filepath.Join(manifestDir, res.Build.Context)
 				}
+				// make sure the dockerfile exists
+				content, e := os.ReadFile(res.Build.Dockerfile)
+				if e != nil {
+					return nil, fmt.Errorf("expecting dockerfile content at %q: %w", res.Build.Dockerfile, e)
+				}
+				// copy the dockerfile (same strategy as bicep files)
+				e = manifest.Files.MkdirAll(resourceName, osutil.PermissionDirectory)
+				if e != nil {
+					return nil, e
+				}
+				res.Build.Dockerfile = filepath.Join(resourceName, filepath.Base(res.Build.Dockerfile))
+				e = manifest.Files.WriteFile(res.Build.Dockerfile, content, osutil.PermissionFile)
+				if e != nil {
+					return nil, e
+				}
 				for _, secret := range res.Build.Secrets {
 					if secret.Source != nil && !filepath.IsAbs(*secret.Source) {
 						*secret.Source = filepath.Join(manifestDir, *secret.Source)

cli/azd/pkg/project/dotnet_importer.go

@@ -323,7 +323,26 @@ func (ai *DotNetImporter) Services(
 
 		if bContainer.Build != nil {
 			defaultLanguage = ServiceLanguageDocker
-			relPath, err := filepath.Rel(p.Path, filepath.Dir(bContainer.Build.Dockerfile))
+			// dockerfiles are copied to the infra folder like bicep files to ensure
+			// provision and deploy works after infra gen.
+			bContainer.Build.Dockerfile = filepath.Join(
+				svcConfig.Project.Path, svcConfig.Project.Infra.Path, name, filepath.Base(bContainer.Build.Dockerfile))
+
+			// If the dockerfile is not in disk, it could have been manually deleted (after infra gen) or
+			// infra gen was never run. In any case, use the in-memory generated dockerfile to build the container.
+			var inMemDockerfile []byte
+			if _, err := os.Stat(bContainer.Build.Dockerfile); errors.Is(err, os.ErrNotExist) {
+				// write file in the temp folder
+				fileName := filepath.Base(bContainer.Build.Dockerfile)
+				// read content from memory fs in the manifest
+				data, err := fs.ReadFile(manifest.Files, filepath.Join(name, fileName))
+				if err != nil {
+					return nil, fmt.Errorf("reading dockerfile for service %s: %w", name, err)
+				}
+				inMemDockerfile = data
+			}
+
+			relPath, err := filepath.Rel(p.Path, filepath.Dir(bContainer.Build.Context))
 			if err != nil {
 				return nil, err
 			}
@@ -339,11 +358,12 @@ func (ai *DotNetImporter) Services(
 			}
 
 			dOptions = DockerProjectOptions{
-				Path:         bContainer.Build.Dockerfile,
-				Context:      bContainer.Build.Context,
-				BuildArgs:    mapToExpandableStringSlice(bArgs, "="),
-				BuildSecrets: bArgsArray,
-				BuildEnv:     reqEnv,
+				Path:            bContainer.Build.Dockerfile,
+				Context:         bContainer.Build.Context,
+				BuildArgs:       mapToExpandableStringSlice(bArgs, "="),
+				BuildSecrets:    bArgsArray,
+				BuildEnv:        reqEnv,
+				InMemDockerfile: inMemDockerfile,
 			}
 		}
 

cli/azd/pkg/project/framework_service_docker.go

@@ -49,6 +49,11 @@ type DockerProjectOptions struct {
 	// Aspire would pass the secret keys, which are env vars that azd will set just to run docker build.
 	BuildSecrets []string `yaml:"-"                     json:"-"`
 	BuildEnv     []string `yaml:"-"                     json:"-"`
+	//InMemDockerfile allow projects to specify a dockerfile contents directly instead of a path on disk.
+	// This is not supported from azure.yaml.
+	// This is used by projects like Aspire that can generate a dockerfile on the fly and don't want to write it to disk.
+	// When this is set, whatever value in Path is ignored and the dockerfile contents in this property is used instead.
+	InMemDockerfile []byte `yaml:"-" json:"-"`
 }
 
 type dockerBuildResult struct {
@@ -310,10 +315,36 @@ func (p *dockerProject) Build(
 			MaxLineCount: 8,
 			Title:        "Docker Output",
 		})
+
+	dockerFilePath := dockerOptions.Path
+	if dockerOptions.InMemDockerfile != nil {
+		// when using an in-memory dockerfile, we write it to a temp file and use that path for the build
+		tempDir, err := os.MkdirTemp("", "dockerfile-for-"+serviceConfig.Name)
+		if err != nil {
+			return nil, fmt.Errorf("creating temp dir for dockerfile for service %s: %w", serviceConfig.Name, err)
+		}
+		// use the name of the original dockerfile path
+		dockerfilePath = filepath.Join(tempDir, filepath.Base(dockerFilePath))
+		err = os.WriteFile(dockerfilePath, dockerOptions.InMemDockerfile, osutil.PermissionFileOwnerOnly)
+		if err != nil {
+			return nil, fmt.Errorf("writing dockerfile for service %s: %w", serviceConfig.Name, err)
+		}
+		dockerFilePath = dockerfilePath
+
+		log.Println("using in-memory dockerfile for build", dockerfilePath)
+
+		// ensure we clean up the temp dockerfile after the build
+		defer func() {
+			if err := os.RemoveAll(tempDir); err != nil {
+				log.Printf("removing temp dockerfile dir %s: %v", tempDir, err)
+			}
+		}()
+	}
+
 	imageId, err := p.docker.Build(
 		ctx,
 		serviceConfig.Path(),
-		dockerOptions.Path,
+		dockerFilePath,
 		dockerOptions.Platform,
 		dockerOptions.Target,
 		dockerOptions.Context,
@@ -329,6 +360,7 @@ func (p *dockerProject) Build(
 	}
 
 	log.Printf("built image %s for %s", imageId, serviceConfig.Name)
+
 	return &ServiceBuildResult{
 		Restore:         restoreOutput,
 		BuildOutputPath: imageId,