Merge pull request docker#75 from doringeman/metrics

Add `--do-not-track` to disable the metrics tracker

Author: doringeman

cmd/cli/commands/install-runner.go

@@ -100,7 +100,7 @@ func ensureStandaloneRunnerAvailable(ctx context.Context, printer standalone.Sta
 	if engineKind == desktop.ModelRunnerEngineKindCloud {
 		port = standalone.DefaultControllerPortCloud
 	}
-	if err := standalone.CreateControllerContainer(ctx, dockerClient, port, gpu, modelStorageVolume, printer); err != nil {
+	if err := standalone.CreateControllerContainer(ctx, dockerClient, port, false, gpu, modelStorageVolume, printer); err != nil {
 		return fmt.Errorf("unable to initialize standalone model runner container: %w", err)
 	}
 
@@ -111,6 +111,7 @@ func ensureStandaloneRunnerAvailable(ctx context.Context, printer standalone.Sta
 func newInstallRunner() *cobra.Command {
 	var port uint16
 	var gpuMode string
+	var doNotTrack bool
 	c := &cobra.Command{
 		Use:   "install-runner",
 		Short: "Install Docker Model Runner (Docker Engine only)",
@@ -182,9 +183,8 @@ func newInstallRunner() *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("unable to initialize standalone model storage: %w", err)
 			}
-
 			// Create the model runner container.
-			if err := standalone.CreateControllerContainer(cmd.Context(), dockerClient, port, gpu, modelStorageVolume, cmd); err != nil {
+			if err := standalone.CreateControllerContainer(cmd.Context(), dockerClient, port, doNotTrack, gpu, modelStorageVolume, cmd); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner container: %w", err)
 			}
 
@@ -196,5 +196,6 @@ func newInstallRunner() *cobra.Command {
 	c.Flags().Uint16Var(&port, "port", standalone.DefaultControllerPortMoby,
 		"Docker container port for Docker Model Runner")
 	c.Flags().StringVar(&gpuMode, "gpu", "auto", "Specify GPU support (none|auto|cuda)")
+	c.Flags().BoolVar(&doNotTrack, "do-not-track", false, "Do not track models usage in Docker Model Runner")
 	return c
 }

cmd/cli/docs/reference/docker_model_install-runner.yaml

@@ -6,6 +6,16 @@ usage: docker model install-runner
 pname: docker model
 plink: docker_model.yaml
 options:
+    - option: do-not-track
+      value_type: bool
+      default_value: "false"
+      description: Do not track models usage in Docker Model Runner
+      deprecated: false
+      hidden: false
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
     - option: gpu
       value_type: string
       default_value: auto

cmd/cli/docs/reference/model_install-runner.md

@@ -5,10 +5,11 @@ Install Docker Model Runner (Docker Engine only)
 
 ### Options
 
-| Name     | Type     | Default | Description                                   |
-|:---------|:---------|:--------|:----------------------------------------------|
-| `--gpu`  | `string` | `auto`  | Specify GPU support (none\|auto\|cuda)        |
-| `--port` | `uint16` | `12434` | Docker container port for Docker Model Runner |
+| Name             | Type     | Default | Description                                      |
+|:-----------------|:---------|:--------|:-------------------------------------------------|
+| `--do-not-track` | `bool`   |         | Do not track models usage in Docker Model Runner |
+| `--gpu`          | `string` | `auto`  | Specify GPU support (none\|auto\|cuda)           |
+| `--port`         | `uint16` | `12434` | Docker container port for Docker Model Runner    |
 
 
 <!---MARKER_GEN_END-->

cmd/cli/pkg/standalone/containers.go

@@ -66,7 +66,7 @@ func determineBridgeGatewayIP(ctx context.Context, dockerClient *client.Client)
 }
 
 // CreateControllerContainer creates and starts a controller container.
-func CreateControllerContainer(ctx context.Context, dockerClient *client.Client, port uint16, gpu gpupkg.GPUSupport, modelStorageVolume string, printer StatusPrinter) error {
+func CreateControllerContainer(ctx context.Context, dockerClient *client.Client, port uint16, doNotTrack bool, gpu gpupkg.GPUSupport, modelStorageVolume string, printer StatusPrinter) error {
 	// Determine the target image.
 	var imageName string
 	switch gpu {
@@ -78,11 +78,13 @@ func CreateControllerContainer(ctx context.Context, dockerClient *client.Client,
 
 	// Set up the container configuration.
 	portStr := strconv.Itoa(int(port))
+	env := []string{"MODEL_RUNNER_PORT=" + portStr}
+	if doNotTrack {
+		env = append(env, "DO_NOT_TRACK=1")
+	}
 	config := &container.Config{
 		Image: imageName,
-		Env: []string{
-			"MODEL_RUNNER_PORT=" + portStr,
-		},
+		Env:   env,
 		ExposedPorts: nat.PortSet{
 			nat.Port(portStr + "/tcp"): struct{}{},
 		},