зеркало из https://github.com/microsoft/docker.git
Fixed some typo's and formatting issues in remote api documentation.
This commit is contained in:
Родитель
d49f141fb3
Коммит
ff6b6f2ce1
|
@ -23,7 +23,7 @@ Usage
|
||||||
* Change the `.rst` files with your favorite editor to your liking.
|
* Change the `.rst` files with your favorite editor to your liking.
|
||||||
* Run `make docs` to clean up old files and generate new ones.
|
* Run `make docs` to clean up old files and generate new ones.
|
||||||
* Your static website can now be found in the `_build` directory.
|
* Your static website can now be found in the `_build` directory.
|
||||||
* To preview what you have generated run `make server` and open <http://localhost:8000/> in your favorite browser.
|
* To preview what you have generated run `make server` and open http://localhost:8000/ in your favorite browser.
|
||||||
|
|
||||||
Working using GitHub's file editor
|
Working using GitHub's file editor
|
||||||
----------------------------------
|
----------------------------------
|
||||||
|
|
|
@ -15,7 +15,7 @@ Docker Remote API
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
- The Remote API is replacing rcli
|
- The Remote API is replacing rcli
|
||||||
- Default port in the docker deamon is 4243
|
- Default port in the docker daemon is 4243
|
||||||
- The API tends to be REST, but for some complex commands, like attach
|
- The API tends to be REST, but for some complex commands, like attach
|
||||||
or pull, the HTTP connection is hijacked to transport stdout stdin
|
or pull, the HTTP connection is hijacked to transport stdout stdin
|
||||||
and stderr
|
and stderr
|
||||||
|
|
|
@ -17,7 +17,7 @@ Docker Remote API v1.0
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
- The Remote API is replacing rcli
|
- The Remote API is replacing rcli
|
||||||
- Default port in the docker deamon is 4243
|
- Default port in the docker daemon is 4243
|
||||||
- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr
|
- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr
|
||||||
|
|
||||||
2. Endpoints
|
2. Endpoints
|
||||||
|
|
|
@ -17,7 +17,7 @@ Docker Remote API v1.1
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
- The Remote API is replacing rcli
|
- The Remote API is replacing rcli
|
||||||
- Default port in the docker deamon is 4243
|
- Default port in the docker daemon is 4243
|
||||||
- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr
|
- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr
|
||||||
|
|
||||||
2. Endpoints
|
2. Endpoints
|
||||||
|
|
|
@ -17,7 +17,7 @@ Docker Remote API v1.2
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
- The Remote API is replacing rcli
|
- The Remote API is replacing rcli
|
||||||
- Default port in the docker deamon is 4243
|
- Default port in the docker daemon is 4243
|
||||||
- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr
|
- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr
|
||||||
|
|
||||||
2. Endpoints
|
2. Endpoints
|
||||||
|
|
|
@ -17,7 +17,7 @@ Docker Remote API v1.3
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
- The Remote API is replacing rcli
|
- The Remote API is replacing rcli
|
||||||
- Default port in the docker deamon is 4243
|
- Default port in the docker daemon is 4243
|
||||||
- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr
|
- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr
|
||||||
|
|
||||||
2. Endpoints
|
2. Endpoints
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
:description: API Documentation for Docker
|
:description: API Documentation for Docker
|
||||||
:keywords: API, Docker, rcli, REST, documentation
|
:keywords: API, Docker, rcli, REST, documentation
|
||||||
|
|
||||||
|
:orphan:
|
||||||
|
|
||||||
======================
|
======================
|
||||||
Docker Remote API v1.4
|
Docker Remote API v1.4
|
||||||
======================
|
======================
|
||||||
|
@ -12,7 +14,7 @@ Docker Remote API v1.4
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
- The Remote API is replacing rcli
|
- The Remote API is replacing rcli
|
||||||
- Default port in the docker deamon is 4243
|
- Default port in the docker daemon is 4243
|
||||||
- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr
|
- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr
|
||||||
|
|
||||||
2. Endpoints
|
2. Endpoints
|
||||||
|
@ -1060,7 +1062,6 @@ Create a new image from a container's changes
|
||||||
:statuscode 404: no such container
|
:statuscode 404: no such container
|
||||||
:statuscode 500: server error
|
:statuscode 500: server error
|
||||||
|
|
||||||
|
|
||||||
3. Going further
|
3. Going further
|
||||||
================
|
================
|
||||||
|
|
||||||
|
@ -1090,5 +1091,7 @@ In this version of the API, /attach, uses hijacking to transport stdin, stdout a
|
||||||
|
|
||||||
To enable cross origin requests to the remote api add the flag "-api-enable-cors" when running docker in daemon mode.
|
To enable cross origin requests to the remote api add the flag "-api-enable-cors" when running docker in daemon mode.
|
||||||
|
|
||||||
|
.. code-block:: bash
|
||||||
|
|
||||||
docker -d -H="192.168.1.9:4243" -api-enable-cors
|
docker -d -H="192.168.1.9:4243" -api-enable-cors
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче