Only print debug messages when --debug is passed

ericcurtin · ericcurtin · commit 77798d05ccb7 · 2025-11-07T14:59:53.000Z
The ones that are too verbose for normal usage.

Signed-off-by: Eric Curtin &lt;eric.curtin@docker.com&gt;
diff --git a/cmd/cli/commands/compose.go b/cmd/cli/commands/compose.go
@@ -51,7 +51,7 @@ func newUpCommand() *cobra.Command {
 
 			sendInfo("Initializing model runner...")
 			kind := modelRunner.EngineKind()
-			standalone, err := ensureStandaloneRunnerAvailable(cmd.Context(), nil)
+			standalone, err := ensureStandaloneRunnerAvailable(cmd.Context(), nil, false)
 			if err != nil {
 				_ = sendErrorf("Failed to initialize standalone model runner: %v", err)
 				return fmt.Errorf("Failed to initialize standalone model runner: %w", err)
diff --git a/cmd/cli/commands/inspect.go b/cmd/cli/commands/inspect.go
@@ -27,7 +27,7 @@ func newInspectCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			if openai && remote {
diff --git a/cmd/cli/commands/install-runner.go b/cmd/cli/commands/install-runner.go
@@ -78,7 +78,7 @@ func inspectStandaloneRunner(container container.Summary) *standaloneRunner {
 // ensureStandaloneRunnerAvailable is a utility function that other commands can
 // use to initialize a default standalone model runner. It is a no-op in
 // unsupported contexts or if automatic installs have been disabled.
-func ensureStandaloneRunnerAvailable(ctx context.Context, printer standalone.StatusPrinter) (*standaloneRunner, error) {
+func ensureStandaloneRunnerAvailable(ctx context.Context, printer standalone.StatusPrinter, debug bool) (*standaloneRunner, error) {
 	// If we're not in a supported model runner context, then don't do anything.
 	engineKind := modelRunner.EngineKind()
 	standaloneSupported := engineKind == types.ModelRunnerEngineKindMoby ||
@@ -138,7 +138,7 @@ func ensureStandaloneRunnerAvailable(ctx context.Context, printer standalone.Sta
 		port = standalone.DefaultControllerPortCloud
 		environment = "cloud"
 	}
-	if err := standalone.CreateControllerContainer(ctx, dockerClient, port, host, environment, false, gpu, "", modelStorageVolume, printer, engineKind); err != nil {
+	if err := standalone.CreateControllerContainer(ctx, dockerClient, port, host, environment, false, gpu, "", modelStorageVolume, printer, engineKind, false); err != nil {
 		return nil, fmt.Errorf("unable to initialize standalone model runner container: %w", err)
 	}
 
@@ -175,7 +175,7 @@ type runnerOptions struct {
 }
 
 // runInstallOrStart is shared logic for install-runner and start-runner commands
-func runInstallOrStart(cmd *cobra.Command, opts runnerOptions) error {
+func runInstallOrStart(cmd *cobra.Command, opts runnerOptions, debug bool) error {
 	// Ensure that we're running in a supported model runner context.
 	engineKind := modelRunner.EngineKind()
 	if engineKind == types.ModelRunnerEngineKindDesktop {
@@ -282,7 +282,7 @@ func runInstallOrStart(cmd *cobra.Command, opts runnerOptions) error {
 		return fmt.Errorf("unable to initialize standalone model storage: %w", err)
 	}
 	// Create the model runner container.
-	if err := standalone.CreateControllerContainer(cmd.Context(), dockerClient, port, opts.host, environment, opts.doNotTrack, gpu, opts.backend, modelStorageVolume, asPrinter(cmd), engineKind); err != nil {
+	if err := standalone.CreateControllerContainer(cmd.Context(), dockerClient, port, opts.host, environment, opts.doNotTrack, gpu, opts.backend, modelStorageVolume, asPrinter(cmd), engineKind, debug); err != nil {
 		return fmt.Errorf("unable to initialize standalone model runner container: %w", err)
 	}
 
@@ -296,6 +296,7 @@ func newInstallRunner() *cobra.Command {
 	var gpuMode string
 	var backend string
 	var doNotTrack bool
+	var debug bool
 	c := &cobra.Command{
 		Use:   "install-runner",
 		Short: "Install Docker Model Runner (Docker Engine only)",
@@ -308,7 +309,7 @@ func newInstallRunner() *cobra.Command {
 				doNotTrack:      doNotTrack,
 				pullImage:       true,
 				pruneContainers: false,
-			})
+			}, debug)
 		},
 		ValidArgsFunction: completion.NoComplete,
 	}
@@ -318,5 +319,6 @@ func newInstallRunner() *cobra.Command {
 	c.Flags().StringVar(&gpuMode, "gpu", "auto", "Specify GPU support (none|auto|cuda|rocm|musa|cann)")
 	c.Flags().StringVar(&backend, "backend", "", backendUsage)
 	c.Flags().BoolVar(&doNotTrack, "do-not-track", false, "Do not track models usage in Docker Model Runner")
+	c.Flags().BoolVar(&debug, "debug", false, "Enable debug logging")
 	return c
 }
diff --git a/cmd/cli/commands/list.go b/cmd/cli/commands/list.go
@@ -36,7 +36,7 @@ func newListCmd() *cobra.Command {
 			if !jsonFormat && !openai && !quiet {
 				standaloneInstallPrinter = asPrinter(cmd)
 			}
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), standaloneInstallPrinter); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), standaloneInstallPrinter, false); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			var modelFilter string
diff --git a/cmd/cli/commands/pull.go b/cmd/cli/commands/pull.go
@@ -28,7 +28,7 @@ func newPullCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			return pullModel(cmd, desktopClient, args[0], ignoreRuntimeMemoryCheck)
diff --git a/cmd/cli/commands/push.go b/cmd/cli/commands/push.go
@@ -24,7 +24,7 @@ func newPushCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			return pushModel(cmd, desktopClient, args[0])
diff --git a/cmd/cli/commands/reinstall-runner.go b/cmd/cli/commands/reinstall-runner.go
@@ -11,6 +11,7 @@ func newReinstallRunner() *cobra.Command {
 	var gpuMode string
 	var backend string
 	var doNotTrack bool
+	var debug bool
 	c := &cobra.Command{
 		Use:   "reinstall-runner",
 		Short: "Reinstall Docker Model Runner (Docker Engine only)",
@@ -23,7 +24,7 @@ func newReinstallRunner() *cobra.Command {
 				doNotTrack:      doNotTrack,
 				pullImage:       true,
 				pruneContainers: true,
-			})
+			}, debug)
 		},
 		ValidArgsFunction: completion.NoComplete,
 	}
@@ -33,5 +34,6 @@ func newReinstallRunner() *cobra.Command {
 	c.Flags().StringVar(&gpuMode, "gpu", "auto", "Specify GPU support (none|auto|cuda|musa|rocm|cann)")
 	c.Flags().StringVar(&backend, "backend", "", backendUsage)
 	c.Flags().BoolVar(&doNotTrack, "do-not-track", false, "Do not track models usage in Docker Model Runner")
+	c.Flags().BoolVar(&debug, "debug", false, "Enable debug logging")
 	return c
 }
diff --git a/cmd/cli/commands/requests.go b/cmd/cli/commands/requests.go
@@ -25,7 +25,7 @@ func newRequestsCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 
diff --git a/cmd/cli/commands/restart-runner.go b/cmd/cli/commands/restart-runner.go
@@ -10,6 +10,7 @@ func newRestartRunner() *cobra.Command {
 	var host string
 	var gpuMode string
 	var doNotTrack bool
+	var debug bool
 	c := &cobra.Command{
 		Use:   "restart-runner",
 		Short: "Restart Docker Model Runner (Docker Engine only)",
@@ -29,7 +30,7 @@ func newRestartRunner() *cobra.Command {
 				gpuMode:    gpuMode,
 				doNotTrack: doNotTrack,
 				pullImage:  false,
-			})
+			}, debug)
 		},
 		ValidArgsFunction: completion.NoComplete,
 	}
@@ -38,5 +39,6 @@ func newRestartRunner() *cobra.Command {
 	c.Flags().StringVar(&host, "host", "127.0.0.1", "Host address to bind Docker Model Runner")
 	c.Flags().StringVar(&gpuMode, "gpu", "auto", "Specify GPU support (none|auto|cuda|musa|rocm|cann)")
 	c.Flags().BoolVar(&doNotTrack, "do-not-track", false, "Do not track models usage in Docker Model Runner")
+	c.Flags().BoolVar(&debug, "debug", false, "Enable debug logging")
 	return c
 }
diff --git a/cmd/cli/commands/rm.go b/cmd/cli/commands/rm.go
@@ -25,7 +25,7 @@ func newRemoveCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			response, err := desktopClient.Remove(args, force)
diff --git a/cmd/cli/commands/run.go b/cmd/cli/commands/run.go
@@ -676,7 +676,8 @@ func newRunCmd() *cobra.Command {
 				return nil
 			}
 
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
+			debug, _ := cmd.Flags().GetBool("debug")
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), debug); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 
diff --git a/cmd/cli/commands/start-runner.go b/cmd/cli/commands/start-runner.go
@@ -10,6 +10,7 @@ func newStartRunner() *cobra.Command {
 	var gpuMode string
 	var backend string
 	var doNotTrack bool
+	var debug bool
 	c := &cobra.Command{
 		Use:   "start-runner",
 		Short: "Start Docker Model Runner (Docker Engine only)",
@@ -20,7 +21,7 @@ func newStartRunner() *cobra.Command {
 				backend:    backend,
 				doNotTrack: doNotTrack,
 				pullImage:  false,
-			})
+			}, debug)
 		},
 		ValidArgsFunction: completion.NoComplete,
 	}
@@ -29,5 +30,6 @@ func newStartRunner() *cobra.Command {
 	c.Flags().StringVar(&gpuMode, "gpu", "auto", "Specify GPU support (none|auto|cuda|musa|rocm|cann)")
 	c.Flags().StringVar(&backend, "backend", "", backendUsage)
 	c.Flags().BoolVar(&doNotTrack, "do-not-track", false, "Do not track models usage in Docker Model Runner")
+	c.Flags().BoolVar(&debug, "debug", false, "Enable debug logging")
 	return c
 }
diff --git a/cmd/cli/commands/status.go b/cmd/cli/commands/status.go
@@ -19,7 +19,7 @@ func newStatusCmd() *cobra.Command {
 		Use:   "status",
 		Short: "Check if the Docker Model Runner is running",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			standalone, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd))
+			standalone, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false)
 			if err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
diff --git a/cmd/cli/commands/tag.go b/cmd/cli/commands/tag.go
@@ -26,7 +26,7 @@ func newTagCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			return tagModel(cmd, desktopClient, args[0], args[1])
diff --git a/cmd/cli/pkg/standalone/containers.go b/cmd/cli/pkg/standalone/containers.go
@@ -233,7 +233,7 @@ func isRootless(ctx context.Context, dockerClient *client.Client) bool {
 }
 
 // Check whether the host Ascend driver path exists. If so, create the corresponding mount configuration.
-func tryGetBindAscendMounts(printer StatusPrinter) []mount.Mount {
+func tryGetBindAscendMounts(printer StatusPrinter, debug bool) []mount.Mount {
 	hostPaths := []string{
 		"/usr/local/dcmi",
 		"/usr/local/bin/npu-smi",
@@ -258,7 +258,7 @@ func tryGetBindAscendMounts(printer StatusPrinter) []mount.Mount {
 			}
 			newMounts = append(newMounts, newMount)
 		} else {
-			if os.Getenv("DEBUG") == "1" {
+			if debug {
 				printer.Printf("[NOT FOUND] Ascend driver path does not exist, skipping: %s\n", hostPath)
 			}
 		}
@@ -268,7 +268,7 @@ func tryGetBindAscendMounts(printer StatusPrinter) []mount.Mount {
 }
 
 // CreateControllerContainer creates and starts a controller container.
-func CreateControllerContainer(ctx context.Context, dockerClient *client.Client, port uint16, host string, environment string, doNotTrack bool, gpu gpupkg.GPUSupport, backend string, modelStorageVolume string, printer StatusPrinter, engineKind types.ModelRunnerEngineKind) error {
+func CreateControllerContainer(ctx context.Context, dockerClient *client.Client, port uint16, host string, environment string, doNotTrack bool, gpu gpupkg.GPUSupport, backend string, modelStorageVolume string, printer StatusPrinter, engineKind types.ModelRunnerEngineKind, debug bool) error {
 	imageName := controllerImageName(gpu, backend)
 
 	// Set up the container configuration.
@@ -311,7 +311,7 @@ func CreateControllerContainer(ctx context.Context, dockerClient *client.Client,
 			Name: "always",
 		},
 	}
-	ascendMounts := tryGetBindAscendMounts(printer)
+	ascendMounts := tryGetBindAscendMounts(printer, debug)
 	if len(ascendMounts) > 0 {
 		hostConfig.Mounts = append(hostConfig.Mounts, ascendMounts...)
 	}

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func newInspectCmd() *cobra.Command {`
`27`	`27`	`return nil`
`28`	`28`	`},`
`29`	`29`	`RunE: func(cmd *cobra.Command, args []string) error {`
`30`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
	`30`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {`
`31`	`31`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`32`	`32`	`}`
`33`	`33`	`if openai && remote {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func newListCmd() *cobra.Command {`
`36`	`36`	`if !jsonFormat && !openai && !quiet {`
`37`	`37`	`standaloneInstallPrinter = asPrinter(cmd)`
`38`	`38`	`}`
`39`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), standaloneInstallPrinter); err != nil {`
	`39`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), standaloneInstallPrinter, false); err != nil {`
`40`	`40`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`41`	`41`	`}`
`42`	`42`	`var modelFilter string`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func newPullCmd() *cobra.Command {`
`28`	`28`	`return nil`
`29`	`29`	`},`
`30`	`30`	`RunE: func(cmd *cobra.Command, args []string) error {`
`31`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
	`31`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {`
`32`	`32`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`33`	`33`	`}`
`34`	`34`	`return pullModel(cmd, desktopClient, args[0], ignoreRuntimeMemoryCheck)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func newPushCmd() *cobra.Command {`
`24`	`24`	`return nil`
`25`	`25`	`},`
`26`	`26`	`RunE: func(cmd *cobra.Command, args []string) error {`
`27`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
	`27`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {`
`28`	`28`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`29`	`29`	`}`
`30`	`30`	`return pushModel(cmd, desktopClient, args[0])`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func newRequestsCmd() *cobra.Command {`
`25`	`25`	`return nil`
`26`	`26`	`},`
`27`	`27`	`RunE: func(cmd *cobra.Command, args []string) error {`
`28`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
	`28`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {`
`29`	`29`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func newRemoveCmd() *cobra.Command {`
`25`	`25`	`return nil`
`26`	`26`	`},`
`27`	`27`	`RunE: func(cmd *cobra.Command, args []string) error {`
`28`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
	`28`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd), false); err != nil {`
`29`	`29`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`30`	`30`	`}`
`31`	`31`	`response, err := desktopClient.Remove(args, force)`