Commit Graph

11 Commits

Author SHA1 Message Date
3253386751 Merge pull request #9208 from duglin/Issue8703
Add support for docker exec to return cmd exitStatus
Upstream-commit: 00c2a8f323548b7d0aa54cfd10a594dd93ddbed0
Component: engine
2014-11-25 18:03:51 -08:00
c28ef478d3 Add support for docker exec to return cmd exitStatus
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.

Closes #8703

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 90928eb1140fc0394e2a79d5e9a91dbc0f02484c
Component: engine
2014-11-25 17:49:25 -08:00
3527869dfc Add AppArmorProfile to container inspect json
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: fa1484d12c5b66f7db03a9c93002ba3df56cdb4e
Component: engine
2014-11-25 01:03:40 +02:00
dbf2eb7488 Proper JSON handling of strings that could be represented as other types
Addresses #6830

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 1b0b1ec65729a2e018df1334b70b851714995e9e
Component: engine
2014-09-16 13:51:02 -04:00
6ae4c9014c update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
12c0cff814 add links to inspect for 'linking' containers
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 55691e5fdc78b5c3015c7a481371e482878c14d2
Component: engine
2014-06-26 20:51:38 +00:00
7d55b5369e do not alter json in docker save
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 3e4e8636c1b05626cae720b47ef99109077e1d3a
Component: engine
2014-06-17 00:06:21 +00:00
f5efd485e9 Do inspect under container lock
It fixes some race conditions
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 947405a90951e4715a8399410b67f4f644415d59
Component: engine
2014-06-14 21:08:23 +04:00
fe1f6345d0 add volumes back to inspect
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 996133b9babbe4c4dfb42ee0d5aea9566568af14
Component: engine
2014-06-03 00:05:54 +00:00
2a289bda14 Standardize API keys: CamelCase
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 68fb7f4b744bf71206898d32fe203556a6261e5d
Component: engine
2014-05-31 01:22:07 +00:00
74d86a8d61 move inspect from server to daemon
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 603e00a3a7644caf118d3efd0932500b4dfc4de3
Component: engine
2014-05-20 19:36:15 +00:00