starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-26 09:20:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into builder_server-3

Browse Source 
Conflicts:
	utils/utils.go
Upstream-commit: 78f86ea502694bf5dbc947802ebc0f5e5426d15c
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-06-14 17:08:39 -07:00
parent d4a6b05778 f839c4752b
commit 726da1690f
24 changed files with 309 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/docs/sources/api/docker_remote_api_v1.2.rst
+24 -7
View File
@@ -47,28 +47,40 @@ List containers
"Image": "base:latest",
"Command": "echo 1",
"Created": 1367854155,
"Status": "Exit 0"
"Status": "Exit 0",
"Ports":"",
"SizeRw":12288,
"SizeRootFs":0
},
{
"Id": "9cd87474be90",
"Image": "base:latest",
"Command": "echo 222222",
"Created": 1367854155,
"Status": "Exit 0"
"Status": "Exit 0",
"Ports":"",
"SizeRw":12288,
"SizeRootFs":0
},
{
"Id": "3176a2479c92",
"Image": "base:latest",
"Command": "echo 3333333333333333",
"Created": 1367854154,
"Status": "Exit 0"
"Status": "Exit 0",
"Ports":"",
"SizeRw":12288,
"SizeRootFs":0
},
{
"Id": "4cb07b47f9fb",
"Image": "base:latest",
"Command": "echo 444444444444444444444444444444444",
"Created": 1367854152,
"Status": "Exit 0"
"Status": "Exit 0",
"Ports":"",
"SizeRw":12288,
"SizeRootFs":0
}
]
@@ -488,13 +500,17 @@ List Images
"Repository":"base",
"Tag":"ubuntu-12.10",
"Id":"b750fe79269d",
"Created":1364102658
"Created":1364102658,
"Size":24653,
"VirtualSize":180116135
},
{
"Repository":"base",
"Tag":"ubuntu-quantal",
"Id":"b750fe79269d",
"Created":1364102658
"Created":1364102658,
"Size":24653,
"VirtualSize":180116135
}
]
@@ -643,7 +659,8 @@ Inspect an image
"Image":"base",
"Volumes":null,
"VolumesFrom":""
}
},
"Size": 6824592
}
:statuscode 200: no error