Merge component 'cli' from git@github.com:docker/cli master

components/cli/cli/cobra.go

@@ -128,7 +128,7 @@ Examples:
 {{ .Example }}
 
 {{- end}}
-{{- if .HasFlags}}
+{{- if .HasAvailableFlags}}
 
 Options:
 {{ wrappedFlagUsages . | trimRightSpace}}

components/cli/cli/command/system/version.go

@@ -51,12 +51,7 @@ Server:{{if ne .Platform.Name ""}} {{.Platform.Name}}{{end}}
    {{- end}}
   {{- end}}
  {{- end}}
- {{- end}}{{- end}}
- {{- if .KubernetesOK}}{{with .Kubernetes}}
- Kubernetes:
-  Version:	{{.Kubernetes}}
-  Stack API:	{{.StackAPI}}
-{{- end}}{{end}}`
+ {{- end}}{{- end}}`
 
 type versionOptions struct {
 	format     string
@@ -65,9 +60,8 @@ type versionOptions struct {
 
 // versionInfo contains version information of both the Client, and Server
 type versionInfo struct {
-	Client     clientVersion
-	Server     *types.Version
-	Kubernetes *kubernetesVersion
+	Client clientVersion
+	Server *types.Version
 }
 
 type clientVersion struct {
@@ -96,10 +90,6 @@ func (v versionInfo) ServerOK() bool {
 	return v.Server != nil
 }
 
-func (v versionInfo) KubernetesOK() bool {
-	return v.Kubernetes != nil
-}
-
 // NewVersionCommand creates a new cobra.Command for `docker version`
 func NewVersionCommand(dockerCli command.Cli) *cobra.Command {
 	var opts versionOptions
@@ -160,21 +150,27 @@ func runVersion(dockerCli command.Cli, opts *versionOptions) error {
 			Experimental:      dockerCli.ClientInfo().HasExperimental,
 			Orchestrator:      string(dockerCli.ClientInfo().Orchestrator),
 		},
-		Kubernetes: getKubernetesVersion(dockerCli, opts.kubeConfig),
 	}
 
 	sv, err := dockerCli.Client().ServerVersion(context.Background())
 	if err == nil {
 		vd.Server = &sv
+		kubeVersion := getKubernetesVersion(dockerCli, opts.kubeConfig)
 		foundEngine := false
+		foundKubernetes := false
 		for _, component := range sv.Components {
-			if component.Name == "Engine" {
+			switch component.Name {
+			case "Engine":
 				foundEngine = true
 				buildTime, ok := component.Details["BuildTime"]
 				if ok {
 					component.Details["BuildTime"] = reformatDate(buildTime)
 				}
-				break
+			case "Kubernetes":
+				foundKubernetes = true
+				if _, ok := component.Details["StackAPI"]; !ok && kubeVersion != nil {
+					component.Details["StackAPI"] = kubeVersion.StackAPI
+				}
 			}
 		}
 
@@ -194,6 +190,15 @@ func runVersion(dockerCli command.Cli, opts *versionOptions) error {
 				},
 			})
 		}
+		if !foundKubernetes && kubeVersion != nil {
+			vd.Server.Components = append(vd.Server.Components, types.ComponentVersion{
+				Name:    "Kubernetes",
+				Version: kubeVersion.Kubernetes,
+				Details: map[string]string{
+					"StackAPI": kubeVersion.StackAPI,
+				},
+			})
+		}
 	}
 
 	if err2 := tmpl.Execute(dockerCli.Out(), vd); err2 != nil && err == nil {

components/cli/docs/reference/commandline/run.md

@@ -592,7 +592,7 @@ Docker supports the following restart policies:
 |:---------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `no`                       | Do not automatically restart the container when it exits. This is the default.                                                                                                                                                                                   |
 | `on-failure[:max-retries]` | Restart only if the container exits with a non-zero exit status. Optionally, limit the number of restart retries the Docker daemon attempts.                                                                                                                     |
-| `unless-stopped`           | Restart the container unless it is explicitly stopped or Docker itself is stopped or restarted. |
+| `unless-stopped`           | Restart the container unless it is explicitly stopped or Docker itself is stopped or restarted.                                                                                                                                                                  |
 | `always`                   | Always restart the container regardless of the exit status. When you specify always, the Docker daemon will try to restart the container indefinitely. The container will also always start on daemon startup, regardless of the current state of the container. |
 
 ```bash
@@ -603,7 +603,7 @@ This will run the `redis` container with a restart policy of **always**
 so that if the container exits, Docker will restart it.
 
 More detailed information on restart policies can be found in the
-[Restart Policies (--restart)](../run.md#restart-policies-restart)
+[Restart Policies (--restart)](../run.md#restart-policies---restart)
 section of the Docker run reference page.
 
 ### Add entries to container hosts file (--add-host)

components/cli/docs/reference/run.md

@@ -620,7 +620,7 @@ systems can really pile up. If instead you'd like Docker to
 **automatically clean up the container and remove the file system when
 the container exits**, you can add the `--rm` flag:
 
-    --rm=false: Automatically remove the container when it exits (incompatible with -d)
+    --rm=false: Automatically remove the container when it exits
 
 > **Note**: When you set the `--rm` flag, Docker also removes the anonymous volumes
 associated with the container when the container is removed. This is similar