moby
diff --git a/Collapse file
‎api/docs/CHANGELOG.md‎
Copy file name to clipboardExpand all lines: api/docs/CHANGELOG.md
+3Lines changed: 3 additions & 0 deletions
Display the source diff
Display the rich diff b/Collapse file
‎api/docs/CHANGELOG.md‎
Copy file name to clipboardExpand all lines: api/docs/CHANGELOG.md
+3Lines changed: 3 additions & 0 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎api/swagger.yaml‎
Copy file name to clipboardExpand all lines: api/swagger.yaml
+15Lines changed: 15 additions & 0 deletions b/Collapse file
‎api/swagger.yaml‎
Copy file name to clipboardExpand all lines: api/swagger.yaml
+15Lines changed: 15 additions & 0 deletions
diff --git a/Collapse file
‎api/types/system/info.go‎
Copy file name to clipboardExpand all lines: api/types/system/info.go
+3Lines changed: 3 additions & 0 deletions b/Collapse file
‎api/types/system/info.go‎
Copy file name to clipboardExpand all lines: api/types/system/info.go
+3Lines changed: 3 additions & 0 deletions
diff --git a/Collapse file
‎daemon/info_unix.go‎
Copy file name to clipboardExpand all lines: daemon/info_unix.go
+5Lines changed: 5 additions & 0 deletions b/Collapse file
‎daemon/info_unix.go‎
Copy file name to clipboardExpand all lines: daemon/info_unix.go
+5Lines changed: 5 additions & 0 deletions
diff --git a/Collapse file
‎daemon/server/router/system/system_routes.go‎
Copy file name to clipboardExpand all lines: daemon/server/router/system/system_routes.go
+5Lines changed: 5 additions & 0 deletions b/Collapse file
‎daemon/server/router/system/system_routes.go‎
Copy file name to clipboardExpand all lines: daemon/server/router/system/system_routes.go
+5Lines changed: 5 additions & 0 deletions
diff --git a/Collapse file
‎vendor/github.com/moby/moby/api/types/system/info.go‎
Copy file name to clipboardExpand all lines: vendor/github.com/moby/moby/api/types/system/info.go
+3Lines changed: 3 additions & 0 deletions b/Collapse file
‎vendor/github.com/moby/moby/api/types/system/info.go‎
Copy file name to clipboardExpand all lines: vendor/github.com/moby/moby/api/types/system/info.go
+3Lines changed: 3 additions & 0 deletions
@@ -15,6 +15,9 @@ keywords: "API, Docker, rcli, REST, documentation"
 
 ## v1.55 API changes
 
+* `GET /info` now includes `UserlandProxy` and `UserlandProxyPath` fields
+   indicating whether the userland proxy is enabled, and the path to the userland proxy binary if enabled.
+
 ## v1.54 API changes
 
 * `GET /images/json` now supports an `identity` query parameter. When set,
 
@@ -7326,6 +7326,21 @@ definitions:
           - "/var/run/cdi"
       Containerd:
         $ref: "#/definitions/ContainerdInfo"
+      UserlandProxy:
+        description: |
+          Indicates if the userland proxy is enabled.
+          Added in v1.55.
+        type: "boolean"
+        x-nullable: true
+        example: true
+      UserlandProxyPath:
+        description: |
+          The path to the userland proxy binary.
+          This field is only populated if the userland proxy is enabled.
+          Added in v1.55.
+        type: "string"
+        x-nullable: true
+        example: "/usr/local/bin/docker-proxy"
 
   ContainerdInfo:
     description: |
 
@@ -78,6 +78,9 @@ type Info struct {
 
 	Containerd *ContainerdInfo `json:",omitempty"`
 
+	UserlandProxy     *bool  `json:",omitempty"`
+	UserlandProxyPath string `json:",omitempty"`
+
 	// Warnings contains a slice of warnings that occurred  while collecting
 	// system information. These warnings are intended to be informational
 	// messages for the user, and are not intended to be parsed / used for
 
@@ -78,6 +78,11 @@ func (daemon *Daemon) fillPlatformInfo(ctx context.Context, v *system.Info, sysI
 	// Set expected and actual commits to the same value to prevent the client
 	// showing that the version does not match the "expected" version/commit.
 
+	v.UserlandProxy = &cfg.EnableUserlandProxy
+	if cfg.EnableUserlandProxy {
+		v.UserlandProxyPath = cfg.UserlandProxyPath
+	}
+
 	if v.CgroupDriver == cgroupNoneDriver {
 		if v.CgroupVersion == "2" {
 			v.Warnings = append(v.Warnings, "WARNING: Running in rootless-mode without cgroups. Systemd is required to enable cgroups in rootless-mode.")
 
@@ -122,6 +122,11 @@ func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *ht
 			// Field introduced in API v1.53.
 			info.NRI = nil
 		}
+		if versions.LessThan(version, "1.55") {
+			// UserlandProxy fields introduced in API v1.55.
+			info.UserlandProxy = nil
+			info.UserlandProxyPath = ""
+		}
 		return compat.Wrap(info, legacyOptions...), nil
 	})