Fix lint errors and improve containerd compatibility for pack CLI

Co-authored-by: JeffreyCA <9157833+JeffreyCA@users.noreply.github.com>

Author: Copilot

cli/azd/.vscode/cspell-azd-dictionary.txt

@@ -67,6 +67,7 @@ buildargs
 BUILDID
 BUILDNUMBER
 buildpacks
+BUILDKIT
 byoi
 cflags
 circleci
@@ -77,6 +78,8 @@ conditionalize
 consolesize
 containerapp
 containerapps
+containerd
+Containerd
 contoso
 createdby
 csharpapp

cli/azd/pkg/project/framework_service_docker.go

@@ -553,6 +553,37 @@ func (p *dockerProject) packBuild(
 		previewer,
 		isContainerdEnabled)
 	p.console.StopPreviewer(ctx, false)
+	
+	// If build fails and it looks like a containerd issue, try again with containerd workarounds
+	if err != nil {
+		if strings.Contains(err.Error(), "failed to write image") && strings.Contains(err.Error(), "No such image") {
+			p.console.Message(ctx, "Detected potential containerd compatibility issue, retrying with workarounds...")
+			
+			// Start previewer again for retry
+			previewer = p.console.ShowPreviewer(ctx,
+				&input.ShowPreviewerOptions{
+					Prefix:       "  ",
+					MaxLineCount: 8,
+					Title:        "Docker (pack) Output - Retry",
+				})
+			
+			// Force containerd compatibility mode
+			retryErr := packCli.BuildWithContainerdSupport(
+				ctx,
+				buildContext,
+				builder,
+				imageName,
+				environ,
+				previewer,
+				true) // Force containerd compatibility
+			p.console.StopPreviewer(ctx, false)
+			
+			if retryErr == nil {
+				err = nil // Success on retry
+			}
+		}
+	}
+	
 	if err != nil {
 		span.EndWithStatus(err)
 
@@ -568,10 +599,10 @@ func (p *dockerProject) packBuild(
 		}
 
 		// Provide better error message for containerd-related issues
-		if isContainerdEnabled && strings.Contains(err.Error(), "failed to write image") {
+		if strings.Contains(err.Error(), "failed to write image") && strings.Contains(err.Error(), "No such image") {
 			return nil, &internal.ErrorWithSuggestion{
 				Err: err,
-				Suggestion: "Docker is configured to use containerd image store, which may cause compatibility issues with pack CLI. " +
+				Suggestion: "This error typically occurs when Docker is configured to use containerd image store, which may cause compatibility issues with pack CLI. " +
 					"Consider disabling 'Use containerd for pulling and storing images' in Docker Desktop settings, " +
 					"or try running the command again as this may be a transient issue.",
 			}

cli/azd/pkg/tools/docker/docker.go

@@ -284,14 +284,30 @@ func (d *Cli) Name() string {
 
 // IsContainerdEnabled checks if Docker is using containerd as the image store
 func (d *Cli) IsContainerdEnabled(ctx context.Context) (bool, error) {
+	// First, try to check for containerd-specific features
 	result, err := d.executeCommand(ctx, "", "system", "info", "--format", "{{.Driver}}")
 	if err != nil {
 		return false, fmt.Errorf("checking docker driver: %w", err)
 	}
 
-	// Check for containerd driver in the output
 	driver := strings.TrimSpace(result.Stdout)
-	return driver == "containerd" || strings.Contains(driver, "containerd"), nil
+	
+	// Check for containerd-based storage drivers
+	if driver == "containerd" || strings.Contains(driver, "containerd") {
+		return true, nil
+	}
+	
+	// Additional check: Look for containerd namespace information which is present when containerd image store is used
+	result, err = d.executeCommand(ctx, "", "system", "info", "--format", "{{.Containerd}}")
+	if err == nil && strings.TrimSpace(result.Stdout) != "<no value>" && strings.TrimSpace(result.Stdout) != "" {
+		// If there's containerd info with namespaces, it's likely using containerd image store
+		infoResult, infoErr := d.executeCommand(ctx, "", "system", "info", "--format", "{{.Containerd.Namespaces}}")
+		if infoErr == nil && strings.Contains(strings.TrimSpace(infoResult.Stdout), "moby") {
+			return true, nil
+		}
+	}
+	
+	return false, nil
 }
 
 func (d *Cli) executeCommand(ctx context.Context, cwd string, args ...string) (exec.RunResult, error) {

cli/azd/pkg/tools/docker/docker_test.go

@@ -627,19 +627,36 @@ func Test_IsContainerdEnabled(t *testing.T) {
 		mockContext := mocks.NewMockContext(context.Background())
 		docker := NewCli(mockContext.CommandRunner)
 
+		callCount := 0
 		mockContext.CommandRunner.When(func(args exec.RunArgs, command string) bool {
 			return strings.Contains(command, "docker system info")
 		}).RespondFn(func(args exec.RunArgs) (exec.RunResult, error) {
 			require.Equal(t, "docker", args.Cmd)
-			require.Equal(t, []string{
-				"system", "info", "--format", "{{.Driver}}",
-			}, args.Args)
-
-			return exec.RunResult{
-				Stdout:   "overlay2",
-				Stderr:   "",
-				ExitCode: 0,
-			}, nil
+			
+			callCount++
+			if callCount == 1 {
+				// First call checks driver
+				require.Equal(t, []string{
+					"system", "info", "--format", "{{.Driver}}",
+				}, args.Args)
+				return exec.RunResult{
+					Stdout:   "overlay2",
+					Stderr:   "",
+					ExitCode: 0,
+				}, nil
+			} else if callCount == 2 {
+				// Second call checks for containerd info
+				require.Equal(t, []string{
+					"system", "info", "--format", "{{.Containerd}}",
+				}, args.Args)
+				return exec.RunResult{
+					Stdout:   "<no value>",
+					Stderr:   "",
+					ExitCode: 0,
+				}, nil
+			}
+			
+			return exec.RunResult{}, errors.New("unexpected call")
 		})
 
 		isContainerd, err := docker.IsContainerdEnabled(context.Background())