Skip to content

Commit 6678f07

Browse files
authored
Merge pull request #1094 from pouchrobot/auto-doc-2018-04-11
docs: auto generate pouch cli/api docs via code
2 parents a6fdc3a + ef8d848 commit 6678f07

File tree

4 files changed

+88
-3
lines changed

4 files changed

+88
-3
lines changed

CONTRIBUTORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ chenzhimin <[email protected]>
1414
1515
1616
17+
1718
Dewey-Ding <[email protected]>
1819
Frank Yang <[email protected]>
1920
frankyang <[email protected]>

docs/api/HTTP_API.md

Lines changed: 79 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,43 @@ POST /daemon/update
783783
* `application/json`
784784

785785

786+
<a name="execinspect"></a>
787+
### Inspect an exec instance
788+
```
789+
GET /exec/{id}/json
790+
```
791+
792+
793+
#### Description
794+
Return low-level information about an exec instance.
795+
796+
797+
#### Parameters
798+
799+
|Type|Name|Description|Schema|
800+
|---|---|---|---|
801+
|**Path**|**id** <br>*required*|Exec instance ID|string|
802+
803+
804+
#### Responses
805+
806+
|HTTP Code|Description|Schema|
807+
|---|---|---|
808+
|**200**|No error|[ContainerExecInspect](#containerexecinspect)|
809+
|**404**|No such exec instance|[4ErrorResponse](#4errorresponse)|
810+
|**500**|Server error|[0ErrorResponse](#0errorresponse)|
811+
812+
813+
#### Produces
814+
815+
* `application/json`
816+
817+
818+
#### Tags
819+
820+
* Exec
821+
822+
786823
<a name="execstart"></a>
787824
### Start an exec instance
788825
```
@@ -1546,6 +1583,25 @@ response returned by daemon when container create successfully
15461583
|**Warnings** <br>*required*|Warnings encountered when creating the container|< string > array|
15471584

15481585

1586+
<a name="containerexecinspect"></a>
1587+
### ContainerExecInspect
1588+
holds information about a running process started.
1589+
1590+
1591+
|Name|Description|Schema|
1592+
|---|---|---|
1593+
|**CanRemove** <br>*optional*||boolean|
1594+
|**ContainerID** <br>*optional*|The ID of this container|string|
1595+
|**DetachKeys** <br>*optional*||string|
1596+
|**ExitCode** <br>*optional*|The last exit code of this container|integer|
1597+
|**ID** <br>*optional*|The ID of this exec|string|
1598+
|**OpenStderr** <br>*optional*||boolean|
1599+
|**OpenStdin** <br>*optional*||boolean|
1600+
|**OpenStdout** <br>*optional*||boolean|
1601+
|**ProcessConfig** <br>*optional*||[ProcessConfig](#processconfig)|
1602+
|**Running** <br>*optional*||boolean|
1603+
1604+
15491605
<a name="containerjson"></a>
15501606
### ContainerJSON
15511607
ContainerJSON contains response of Engine API:
@@ -1734,6 +1790,8 @@ Configuration for a network endpoint.
17341790

17351791
<a name="execcreateconfig"></a>
17361792
### ExecCreateConfig
1793+
is a small subset of the Config struct that holds the configuration.
1794+
17371795

17381796
|Name|Description|Schema|
17391797
|---|---|---|
@@ -1750,14 +1808,18 @@ Configuration for a network endpoint.
17501808

17511809
<a name="execcreateresp"></a>
17521810
### ExecCreateResp
1811+
contains response of Remote API POST "/containers/{name:.*}/exec".
17531812

1754-
|Name|Schema|
1755-
|---|---|
1756-
|**Id** <br>*optional*|string|
1813+
1814+
|Name|Description|Schema|
1815+
|---|---|---|
1816+
|**Id** <br>*optional*|ID is the exec ID|string|
17571817

17581818

17591819
<a name="execstartconfig"></a>
17601820
### ExecStartConfig
1821+
ExecStartConfig is a temp struct used by execStart.
1822+
17611823

17621824
|Name|Description|Schema|
17631825
|---|---|---|
@@ -2109,6 +2171,20 @@ entries are added to the mapping table.
21092171
*Type* : < string, < [PortBinding](#portbinding) > array > map
21102172

21112173

2174+
<a name="processconfig"></a>
2175+
### ProcessConfig
2176+
ExecProcessConfig holds information about the exec process.
2177+
2178+
2179+
|Name|Schema|
2180+
|---|---|
2181+
|**arguments** <br>*optional*|< string > array|
2182+
|**entrypoint** <br>*optional*|string|
2183+
|**privileged** <br>*optional*|boolean|
2184+
|**tty** <br>*optional*|boolean|
2185+
|**user** <br>*optional*|string|
2186+
2187+
21122188
<a name="registryserviceconfig"></a>
21132189
### RegistryServiceConfig
21142190
RegistryServiceConfig stores daemon registry services configuration.

docs/commandline/pouch_network.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Manage pouch networks
66

77
Manager the networks in pouchd. It contains the functions of create/remove/list/inspect network, 'driver' is used to list drivers that pouch support. Now bridge network is supported in pouchd defaulted, it will be initialized when pouchd starting.
88

9+
```
10+
pouch network [command]
11+
```
12+
913
### Options
1014

1115
```

docs/commandline/pouch_volume.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Manage pouch volumes
66

77
Manager the volumes in pouchd. It contains the functions of create/remove/list/inspect volume, 'driver' is used to list drivers that pouch support. The default volume driver is local, it will make a directory to bind into container.
88

9+
```
10+
pouch volume [command]
11+
```
12+
913
### Options
1014

1115
```

0 commit comments

Comments
 (0)