fix pull image process output from stderr to stdout

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
containerd · Dec 19, 2024 · c0da4d8 · c0da4d8
1 parent 0e5f7fd
commit c0da4d8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/cmd/nerdctl/image/image_pull.go b/cmd/nerdctl/image/image_pull.go
@@ -129,8 +129,9 @@ func processPullCommandFlags(cmd *cobra.Command) (types.ImagePullOptions, error)
 		RFlags: types.RemoteSnapshotterFlags{
 			SociIndexDigest: sociIndexDigest,
 		},
-		Stdout: cmd.OutOrStdout(),
-		Stderr: cmd.OutOrStderr(),
+		Stdout:                 cmd.OutOrStdout(),
+		Stderr:                 cmd.OutOrStderr(),
+		ProgressOutputToStdout: true,
 	}, nil
 }
 

diff --git a/pkg/api/types/image_types.go b/pkg/api/types/image_types.go
@@ -189,8 +189,11 @@ type RemoteSnapshotterFlags struct {
 
 // ImagePullOptions specifies options for `nerdctl (image) pull`.
 type ImagePullOptions struct {
-	Stdout        io.Writer
-	Stderr        io.Writer
+	Stdout io.Writer
+	Stderr io.Writer
+	// ProgressOutputToStdout directs progress output to stdout instead of stderr
+	ProgressOutputToStdout bool
+
 	GOptions      GlobalCommandOptions
 	VerifyOptions ImageVerifyOptions
 	// Unpack the image for the current single platform.

diff --git a/pkg/imgutil/imgutil.go b/pkg/imgutil/imgutil.go
@@ -207,6 +207,9 @@ func PullImage(ctx context.Context, client *containerd.Client, resolver remotes.
 	}
 	if !options.Quiet {
 		config.ProgressOutput = options.Stderr
+		if options.ProgressOutputToStdout {
+			config.ProgressOutput = options.Stdout
+		}
 	}
 
 	// unpack(B) if given 1 platform unless specified by `unpack`