From e2641596d85ea05f08cd93df13fdd5a5ccd38835 Mon Sep 17 00:00:00 2001 From: Charles Chan Date: Sun, 2 Aug 2015 11:47:13 -0700 Subject: [PATCH] Fix #15212: Add "Labels" key to output of /containers/json Applied retroactively from API v1.18 - v1.21. Signed-off-by: Charles Chan Upstream-commit: b245bcd458492c9b348b790a9422dd7478f9af83 Component: engine --- .../engine/docs/reference/api/docker_remote_api_v1.18.md | 8 ++++++++ .../engine/docs/reference/api/docker_remote_api_v1.19.md | 8 ++++++++ .../engine/docs/reference/api/docker_remote_api_v1.20.md | 8 ++++++++ .../engine/docs/reference/api/docker_remote_api_v1.21.md | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/components/engine/docs/reference/api/docker_remote_api_v1.18.md b/components/engine/docs/reference/api/docker_remote_api_v1.18.md index 1adf67650a..8bdb98ff9a 100644 --- a/components/engine/docs/reference/api/docker_remote_api_v1.18.md +++ b/components/engine/docs/reference/api/docker_remote_api_v1.18.md @@ -49,6 +49,11 @@ List containers "Created": 1367854155, "Status": "Exit 0", "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}], + "Labels": { + "com.example.vendor": "Acme", + "com.example.license": "GPL", + "com.example.version": "1.0" + }, "SizeRw": 12288, "SizeRootFs": 0 }, @@ -60,6 +65,7 @@ List containers "Created": 1367854155, "Status": "Exit 0", "Ports": [], + "Labels": {}, "SizeRw": 12288, "SizeRootFs": 0 }, @@ -71,6 +77,7 @@ List containers "Created": 1367854154, "Status": "Exit 0", "Ports":[], + "Labels": {}, "SizeRw":12288, "SizeRootFs":0 }, @@ -82,6 +89,7 @@ List containers "Created": 1367854152, "Status": "Exit 0", "Ports": [], + "Labels": {}, "SizeRw": 12288, "SizeRootFs": 0 } diff --git a/components/engine/docs/reference/api/docker_remote_api_v1.19.md b/components/engine/docs/reference/api/docker_remote_api_v1.19.md index d5832aa245..3068b102a0 100644 --- a/components/engine/docs/reference/api/docker_remote_api_v1.19.md +++ b/components/engine/docs/reference/api/docker_remote_api_v1.19.md @@ -51,6 +51,11 @@ List containers "Created": 1367854155, "Status": "Exit 0", "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}], + "Labels": { + "com.example.vendor": "Acme", + "com.example.license": "GPL", + "com.example.version": "1.0" + }, "SizeRw": 12288, "SizeRootFs": 0 }, @@ -62,6 +67,7 @@ List containers "Created": 1367854155, "Status": "Exit 0", "Ports": [], + "Labels": {}, "SizeRw": 12288, "SizeRootFs": 0 }, @@ -73,6 +79,7 @@ List containers "Created": 1367854154, "Status": "Exit 0", "Ports":[], + "Labels": {}, "SizeRw":12288, "SizeRootFs":0 }, @@ -84,6 +91,7 @@ List containers "Created": 1367854152, "Status": "Exit 0", "Ports": [], + "Labels": {}, "SizeRw": 12288, "SizeRootFs": 0 } diff --git a/components/engine/docs/reference/api/docker_remote_api_v1.20.md b/components/engine/docs/reference/api/docker_remote_api_v1.20.md index 40c58af0e7..73ea4bf493 100644 --- a/components/engine/docs/reference/api/docker_remote_api_v1.20.md +++ b/components/engine/docs/reference/api/docker_remote_api_v1.20.md @@ -51,6 +51,11 @@ List containers "Created": 1367854155, "Status": "Exit 0", "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}], + "Labels": { + "com.example.vendor": "Acme", + "com.example.license": "GPL", + "com.example.version": "1.0" + }, "SizeRw": 12288, "SizeRootFs": 0 }, @@ -62,6 +67,7 @@ List containers "Created": 1367854155, "Status": "Exit 0", "Ports": [], + "Labels": {}, "SizeRw": 12288, "SizeRootFs": 0 }, @@ -73,6 +79,7 @@ List containers "Created": 1367854154, "Status": "Exit 0", "Ports":[], + "Labels": {}, "SizeRw":12288, "SizeRootFs":0 }, @@ -84,6 +91,7 @@ List containers "Created": 1367854152, "Status": "Exit 0", "Ports": [], + "Labels": {}, "SizeRw": 12288, "SizeRootFs": 0 } diff --git a/components/engine/docs/reference/api/docker_remote_api_v1.21.md b/components/engine/docs/reference/api/docker_remote_api_v1.21.md index 05e802367f..7a3545a0e6 100644 --- a/components/engine/docs/reference/api/docker_remote_api_v1.21.md +++ b/components/engine/docs/reference/api/docker_remote_api_v1.21.md @@ -51,6 +51,11 @@ List containers "Created": 1367854155, "Status": "Exit 0", "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}], + "Labels": { + "com.example.vendor": "Acme", + "com.example.license": "GPL", + "com.example.version": "1.0" + }, "SizeRw": 12288, "SizeRootFs": 0 }, @@ -62,6 +67,7 @@ List containers "Created": 1367854155, "Status": "Exit 0", "Ports": [], + "Labels": {}, "SizeRw": 12288, "SizeRootFs": 0 }, @@ -73,6 +79,7 @@ List containers "Created": 1367854154, "Status": "Exit 0", "Ports":[], + "Labels": {}, "SizeRw":12288, "SizeRootFs":0 }, @@ -84,6 +91,7 @@ List containers "Created": 1367854152, "Status": "Exit 0", "Ports": [], + "Labels": {}, "SizeRw": 12288, "SizeRootFs": 0 }