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

components/cli/cli/compose/loader/loader_test.go

@@ -657,6 +657,7 @@ services:
      context: ./web
     links:
       - bar
+    pid: host
   db:
     image: db
     build:
@@ -670,7 +671,7 @@ services:
 	require.NoError(t, err)
 
 	unsupported := GetUnsupportedProperties(configDetails)
-	assert.Equal(t, []string{"build", "links"}, unsupported)
+	assert.Equal(t, []string{"build", "links", "pid"}, unsupported)
 }
 
 func TestBuildProperties(t *testing.T) {

components/cli/cli/compose/types/types.go

@@ -17,6 +17,7 @@ var UnsupportedProperties = []string{
 	"links",
 	"mac_address",
 	"network_mode",
+	"pid",
 	"privileged",
 	"restart",
 	"security_opt",

components/cli/contrib/completion/bash/docker

@@ -4945,6 +4945,7 @@ _docker() {
 		secret
 		service
 		stack
+		swarm
 		system
 		volume
 	)
@@ -4988,7 +4989,6 @@ _docker() {
 		start
 		stats
 		stop
-		swarm
 		tag
 		top
 		unpause