Simplify containerd detection to use DriverStatus check

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

Author: Copilot

cli/azd/pkg/project/framework_service_docker.go

@@ -553,20 +553,20 @@ 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,
@@ -577,13 +577,13 @@ func (p *dockerProject) packBuild(
 				previewer,
 				true) // Force containerd compatibility
 			p.console.StopPreviewer(ctx, false)
-			
+
 			if retryErr == nil {
 				err = nil // Success on retry
 			}
 		}
 	}
-	
+
 	if err != nil {
 		span.EndWithStatus(err)
 
@@ -602,7 +602,8 @@ func (p *dockerProject) packBuild(
 		if strings.Contains(err.Error(), "failed to write image") && strings.Contains(err.Error(), "No such image") {
 			return nil, &internal.ErrorWithSuggestion{
 				Err: err,
-				Suggestion: "This error typically occurs when 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,30 +284,15 @@ 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}}")
+	result, err := d.executeCommand(ctx, "", "system", "info", "--format", "{{.DriverStatus}}")
 	if err != nil {
-		return false, fmt.Errorf("checking docker driver: %w", err)
+		return false, fmt.Errorf("checking docker driver status: %w", err)
 	}
-	
-	driver := strings.TrimSpace(result.Stdout)
-	
-	// 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
+
+	driverStatus := strings.TrimSpace(result.Stdout)
+
+	// Check for containerd snapshotter which indicates containerd image store is enabled
+	return strings.Contains(driverStatus, "io.containerd.snapshotter.v1"), nil
 }
 
 func (d *Cli) executeCommand(ctx context.Context, cwd string, args ...string) (exec.RunResult, error) {

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

@@ -607,11 +607,11 @@ func Test_IsContainerdEnabled(t *testing.T) {
 		}).RespondFn(func(args exec.RunArgs) (exec.RunResult, error) {
 			require.Equal(t, "docker", args.Cmd)
 			require.Equal(t, []string{
-				"system", "info", "--format", "{{.Driver}}",
+				"system", "info", "--format", "{{.DriverStatus}}",
 			}, args.Args)
 
 			return exec.RunResult{
-				Stdout:   "containerd",
+				Stdout:   "[[driver-type io.containerd.snapshotter.v1]]",
 				Stderr:   "",
 				ExitCode: 0,
 			}, nil
@@ -627,36 +627,20 @@ 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)
-			
-			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")
+			require.Equal(t, []string{
+				"system", "info", "--format", "{{.DriverStatus}}",
+			}, args.Args)
+
+			return exec.RunResult{
+				Stdout: "[[Backing Filesystem extfs] [Supports d_type true] [Using metacopy false] " +
+					"[Native Overlay Diff true] [userxattr false]]",
+				Stderr:   "",
+				ExitCode: 0,
+			}, nil
 		})
 
 		isContainerd, err := docker.IsContainerdEnabled(context.Background())
@@ -683,6 +667,6 @@ func Test_IsContainerdEnabled(t *testing.T) {
 
 		require.Error(t, err)
 		require.False(t, isContainerd)
-		require.Contains(t, err.Error(), "checking docker driver")
+		require.Contains(t, err.Error(), "checking docker driver status")
 	})
 }

cli/azd/pkg/tools/pack/pack.go

@@ -212,13 +212,13 @@ func (cli *Cli) BuildWithContainerdSupport(
 
 	runArgs := exec.NewRunArgs(cli.path, "build", imageName, "--builder", builder, "--path", cwd)
 	runArgs.Args = append(runArgs.Args, envArgs...)
-	
+
 	// When containerd is enabled, set environment variables to improve compatibility
 	if isContainerdEnabled {
 		// Force pack to use Docker daemon directly instead of relying on containerd image store
 		runArgs = runArgs.WithEnv([]string{"DOCKER_BUILDKIT=0"})
 	}
-	
+
 	if progressWriter != nil {
 		runArgs = runArgs.WithStdOut(progressWriter).WithStdErr(progressWriter)
 	}

cli/azd/pkg/tools/pack/pack_test.go

@@ -247,7 +247,6 @@ func TestNewPackCliUpgrade(t *testing.T) {
 	require.Equal(t, "pack cli", string(contents))
 }
 
-
 func Test_PackCli_BuildWithContainerdSupport(t *testing.T) {
 	tests := []struct {
 		name                string
@@ -287,7 +286,7 @@ func Test_PackCli_BuildWithContainerdSupport(t *testing.T) {
 					}
 				}
 
-				require.Equal(t, tt.isContainerdEnabled, buildkitDisabled, 
+				require.Equal(t, tt.isContainerdEnabled, buildkitDisabled,
 					"Expected DOCKER_BUILDKIT=0 environment variable to be %v", tt.isContainerdEnabled)
 
 				return exec.RunResult{ExitCode: 0}, nil