@@ -56,7 +56,8 @@ DOCKER_ENVS := \

 	-e https_proxy \

 	-e no_proxy \

 	-e VERSION \

-	-e PLATFORM

+	-e PLATFORM \

+	-e PRODUCT

 # note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds

 # to allow `make BIND_DIR=. shell` or `make BIND_DIR= test`

@@ -10,6 +10,7 @@ import (

 	"github.com/docker/docker/dockerversion"

 	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/docker/pkg/term"

+	"github.com/moby/buildkit/util/apicaps"

 	"github.com/sirupsen/logrus"

 	"github.com/spf13/cobra"

 )

@@ -42,6 +43,12 @@ func newDaemonCommand() *cobra.Command {

 	return cmd

 }

+func init() {

+	if dockerversion.ProductName != "" {

+		apicaps.ExportedProduct = dockerversion.ProductName

+	}

+}

+

 func main() {

 	if reexec.Init() {

 		return

@@ -14,4 +14,5 @@ const (

 	RuncCommitID       = "library-import"

 	InitCommitID       = "library-import"

 	PlatformName       = ""

+	ProductName        = ""

 )

@@ -365,7 +365,7 @@ Try {

     # Run autogen if building binaries or running unit tests.

     if ($Client -or $Daemon -or $TestUnit) {

         Write-Host "INFO: Invoking autogen..."

-        Try { .\hack\make\.go-autogen.ps1 -CommitString $gitCommit -DockerVersion $dockerVersion -Platform "$env:PLATFORM" }

+        Try { .\hack\make\.go-autogen.ps1 -CommitString $gitCommit -DockerVersion $dockerVersion -Platform "$env:PLATFORM" -Product "$env:PRODUCT" }

         Catch [Exception] { Throw $_ }

     }

@@ -21,6 +21,7 @@ const (

 	IAmStatic          string = "${IAMSTATIC:-true}"

 	ContainerdCommitID string = "${CONTAINERD_COMMIT}"

 	PlatformName       string = "${PLATFORM}"

+	ProductName        string = "${PRODUCT}"

 )

 // AUTOGENERATED FILE; see /go/src/github.com/docker/docker/hack/make/.go-autogen

@@ -15,7 +15,8 @@

 param(

     [Parameter(Mandatory=$true)][string]$CommitString,

     [Parameter(Mandatory=$true)][string]$DockerVersion,

-    [Parameter(Mandatory=$false)][string]$Platform

+    [Parameter(Mandatory=$false)][string]$Platform,

+    [Parameter(Mandatory=$false)][string]$Product

 )

 $ErrorActionPreference = "Stop"

@@ -45,6 +46,7 @@ const (

     Version            string = "'+$DockerVersion+'"

     BuildTime          string = "'+$buildDateTime+'"

     PlatformName       string = "'+$Platform+'"

+    ProductName        string = "'+$Product+'"

 )

 // AUTOGENERATED FILE; see hack\make\.go-autogen.ps1