Merge pull request #15236 from charleswhchan/patch-1
Fix #15212: Add "Label" key to output of /containers/json
This commit is contained in:
commit
bc12094251
|
@ -49,6 +49,11 @@ List containers
|
||||||
"Created": 1367854155,
|
"Created": 1367854155,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
|
"Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
|
||||||
|
"Labels": {
|
||||||
|
"com.example.vendor": "Acme",
|
||||||
|
"com.example.license": "GPL",
|
||||||
|
"com.example.version": "1.0"
|
||||||
|
},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
},
|
},
|
||||||
|
@ -60,6 +65,7 @@ List containers
|
||||||
"Created": 1367854155,
|
"Created": 1367854155,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [],
|
"Ports": [],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
},
|
},
|
||||||
|
@ -71,6 +77,7 @@ List containers
|
||||||
"Created": 1367854154,
|
"Created": 1367854154,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports":[],
|
"Ports":[],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw":12288,
|
"SizeRw":12288,
|
||||||
"SizeRootFs":0
|
"SizeRootFs":0
|
||||||
},
|
},
|
||||||
|
@ -82,6 +89,7 @@ List containers
|
||||||
"Created": 1367854152,
|
"Created": 1367854152,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [],
|
"Ports": [],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,6 +51,11 @@ List containers
|
||||||
"Created": 1367854155,
|
"Created": 1367854155,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
|
"Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
|
||||||
|
"Labels": {
|
||||||
|
"com.example.vendor": "Acme",
|
||||||
|
"com.example.license": "GPL",
|
||||||
|
"com.example.version": "1.0"
|
||||||
|
},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
},
|
},
|
||||||
|
@ -62,6 +67,7 @@ List containers
|
||||||
"Created": 1367854155,
|
"Created": 1367854155,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [],
|
"Ports": [],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
},
|
},
|
||||||
|
@ -73,6 +79,7 @@ List containers
|
||||||
"Created": 1367854154,
|
"Created": 1367854154,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports":[],
|
"Ports":[],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw":12288,
|
"SizeRw":12288,
|
||||||
"SizeRootFs":0
|
"SizeRootFs":0
|
||||||
},
|
},
|
||||||
|
@ -84,6 +91,7 @@ List containers
|
||||||
"Created": 1367854152,
|
"Created": 1367854152,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [],
|
"Ports": [],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,6 +51,11 @@ List containers
|
||||||
"Created": 1367854155,
|
"Created": 1367854155,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
|
"Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
|
||||||
|
"Labels": {
|
||||||
|
"com.example.vendor": "Acme",
|
||||||
|
"com.example.license": "GPL",
|
||||||
|
"com.example.version": "1.0"
|
||||||
|
},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
},
|
},
|
||||||
|
@ -62,6 +67,7 @@ List containers
|
||||||
"Created": 1367854155,
|
"Created": 1367854155,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [],
|
"Ports": [],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
},
|
},
|
||||||
|
@ -73,6 +79,7 @@ List containers
|
||||||
"Created": 1367854154,
|
"Created": 1367854154,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports":[],
|
"Ports":[],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw":12288,
|
"SizeRw":12288,
|
||||||
"SizeRootFs":0
|
"SizeRootFs":0
|
||||||
},
|
},
|
||||||
|
@ -84,6 +91,7 @@ List containers
|
||||||
"Created": 1367854152,
|
"Created": 1367854152,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [],
|
"Ports": [],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,6 +51,11 @@ List containers
|
||||||
"Created": 1367854155,
|
"Created": 1367854155,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
|
"Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
|
||||||
|
"Labels": {
|
||||||
|
"com.example.vendor": "Acme",
|
||||||
|
"com.example.license": "GPL",
|
||||||
|
"com.example.version": "1.0"
|
||||||
|
},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
},
|
},
|
||||||
|
@ -62,6 +67,7 @@ List containers
|
||||||
"Created": 1367854155,
|
"Created": 1367854155,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [],
|
"Ports": [],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
},
|
},
|
||||||
|
@ -73,6 +79,7 @@ List containers
|
||||||
"Created": 1367854154,
|
"Created": 1367854154,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports":[],
|
"Ports":[],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw":12288,
|
"SizeRw":12288,
|
||||||
"SizeRootFs":0
|
"SizeRootFs":0
|
||||||
},
|
},
|
||||||
|
@ -84,6 +91,7 @@ List containers
|
||||||
"Created": 1367854152,
|
"Created": 1367854152,
|
||||||
"Status": "Exit 0",
|
"Status": "Exit 0",
|
||||||
"Ports": [],
|
"Ports": [],
|
||||||
|
"Labels": {},
|
||||||
"SizeRw": 12288,
|
"SizeRw": 12288,
|
||||||
"SizeRootFs": 0
|
"SizeRootFs": 0
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue