1b7aca4d0a
Merge pull request #8646 from ndeloof/patch-3
...
Update docker_remote_api.md
Upstream-commit: 90221e28d61ed2a71ebbc8160d60156b8145dc43
Component: engine
2014-10-28 19:08:55 -07:00
e6c9b85c85
Expose # of CPUs and memory available on docker info.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 61f8001c23dc4fbd7b1113f20b89a0dbade9aa82
Component: engine
2014-10-24 15:56:37 -07:00
82b5bee9bb
Bump API to v1.16.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: ca6cc6560987a87b8f3b4fe4c3c227d692c49117
Component: engine
2014-10-24 11:25:44 -07:00
4391a7b5ae
Document alternate command to check encrypted TCP socket
...
as curl command seems to fail on OSX Mavericks
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: ab03e898ff22e1bdb2452cfc2d9aad1313c97fc9
Component: engine
2014-10-24 09:15:15 +02:00
cb88e66803
Correct url from github.com/dotcloud/docker{,-py}
...
to github.com/docker/docker{,-py}
Signed-off-by: Torstein Husebø <torstein@huseboe.net >
Upstream-commit: 64cb7725381740986022eb4633c8f91be3dd7b4f
Component: engine
2014-10-22 16:57:39 +02:00
f3d73e7359
Merge pull request #8531 from SvenDowideit/move-registry-search-to-registry-api
...
Move registry search API docs into the registry API document.
Upstream-commit: 6ce4f82ebe822dbc3cf945abba5f8a09ca48ea9f
Component: engine
2014-10-16 18:27:37 -07:00
f5e599aefb
Fix commit api document
...
The commit message field should be `comment`, not `m`
https://github.com/docker/docker/blob/master/api/server/server.go#L478
Signed-off-by: Huayi Zhang <irachex@gmail.com >
Upstream-commit: f6140060e3b7fc8e6f577ca95be0eb5bf8cd1fd4
Component: engine
2014-10-16 18:10:58 +08:00
b0a547e200
Merge pull request #8582 from SvenDowideit/api-docs-link-to-basics-page
...
The basics page moved, update link.
Upstream-commit: 73792969e62bed273dc8aca609d513e80856807a
Component: engine
2014-10-15 11:34:25 -07:00
eb924a4c12
Add a little info on how to talk to the TLS encrypted Docker Socket
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 1c68de798fdebba5eefa1c66a79e946c7bb06fb5
Component: engine
2014-10-15 17:24:53 +10:00
256f3dd5a2
The basics page moved, update link.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: a64ff0bf7a8c69e5698dc7e757d4ac56dd91b738
Component: engine
2014-10-15 16:48:43 +10:00
05808ba39b
Move registry search API docs into the registry API document.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 6b285c4cd6fe4a28c73a7137fe47753510befd3f
Component: engine
2014-10-14 11:53:10 +10:00
f21e8f2701
docs: fixing docker.io api
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
Upstream-commit: 137bad4b48f899cb544500bf898cbd74464a8d2f
Component: engine
2014-10-12 09:05:58 +02:00
0ef343ce97
Merge pull request #8470 from fgrehm/patch-3
...
docs: Remove `Detach` parameter from Exec Create example
Upstream-commit: 88a41aa7d1f90c75086119553b06525ab16118be
Component: engine
2014-10-09 15:25:51 -07:00
ffd31097c3
Revert "Change content-type for json stream to application/x-json-stream."
...
This reverts commit 10ab2089ce189d5bea3f7aaac3b5081471309478.
Conflicts:
api/client/utils.go
docs/sources/reference/api/docker_remote_api.md
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 4c6b7cd1b560c72f2c79c28f77644f05b3ee657e
Component: engine
2014-10-09 13:17:47 -07:00
f823d93515
docs: Remove Detach parameter from Exec Create example
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com >
Upstream-commit: 2fd0e8eb5f062bd549f961122d172ecdf1ae085e
Component: engine
2014-10-08 10:31:12 -03:00
ddc310264c
Merge pull request #8375 from fgrehm/patch-2
...
docs: Update `docker exec` examples
Upstream-commit: 94da44cacf189de091509d73298cfdc19fda557e
Component: engine
2014-10-03 11:30:37 -07:00
b84c9439ff
Merge pull request #8336 from kwk/improve_docs_with_note_about_registry_frontend_web_app
...
Improve docs with note about registry frontend web app
Upstream-commit: 23dc2ca2d5eb74675acf44f0f8b7a8a666c13263
Component: engine
2014-10-03 11:00:32 -07:00
b21689409c
docs: Update docker exec examples
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com >
Upstream-commit: 6480b30a997a8fe9884504f669b9c5a68d887f55
Component: engine
2014-10-03 01:13:59 -03:00
cf801a51a6
Typo: changed "Maintainers" to "maintainers"
...
Signed-off-by: Konrad Kleine <konrad.wilhelm.kleine@gmail.com >
Upstream-commit: e08f22cdb2b1e10661f76582f9a8ba7d1cb80bea
Component: engine
2014-10-02 08:43:30 +02:00
9710588070
Merge pull request #8316 from duglin/Issue4787
...
Add a note about using an open schema model - Issue #4787
Upstream-commit: 04251b3e544d82db2dfc140bd27172a7f1876e5e
Component: engine
2014-10-01 11:21:09 -07:00
142c3f0753
Add a note about using an open schema model
...
Closes : #4787
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: c8f3151aa6a0b68674aa68061b723424278a54c5
Component: engine
2014-10-01 11:05:12 -07:00
fc1af766be
Merge pull request #8313 from duglin/Issue4877
...
Add missing "tag" parameter to tag API - Issue #4877
Upstream-commit: f852233a015d0f65ff1cd4e475e21ba9b9143c3c
Component: engine
2014-10-01 10:34:57 -07:00
1a57ba4c11
Create registry_api_client_libraries.md
...
Signed-off-by: Konrad Kleine <konrad.wilhelm.kleine@gmail.com >
Upstream-commit: 3446735a3e30788689ea3d66994f9b27b9327e18
Component: engine
2014-10-01 15:20:49 +02:00
5ab43c288e
Merge pull request #8286 from ClusterHQ/8285-volume-api-docs
...
Document Volumes and Binds
Upstream-commit: 1d199f2d8508adb1d759fedc31d9e6ccf7df25ae
Component: engine
2014-09-30 15:53:41 -04:00
1dd6380138
Adding exec remote API documentation along with minor code cleanup.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 021ecb1d1355e8291a5a872c761a1e367072e308
Component: engine
2014-09-30 18:26:58 +00:00
d5dfd4845d
Add missing "tag" parameter to tag API
...
Closes #4877
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ee0b64f7a79b7d704110d1f541710ae6fba5eb37
Component: engine
2014-09-30 10:53:29 -07:00
2281e9a92d
Fixed simple typo
...
Signed-off-by: Scott Collier <emailscottcollier@gmail.com >
Upstream-commit: 35aa3fd5f20f1d9575e3f25366680f9ed9f36aa0
Component: engine
2014-09-29 18:58:47 -05:00
fb99c55930
Document Volumes and Binds
...
Signed-off-by: Jean-Paul Calderone <jean-paul@clusterhq.com >
Upstream-commit: 8e70d553f93e624b38bef6bc4aa3dd2e4bed6a81
Component: engine
2014-09-29 14:59:48 -04:00
904bd73f75
Merge pull request #8227 from SvenDowideit/list-container-events
...
The list of events that 'grep' told me about
Upstream-commit: 2682393ce18b62867e900edd284d05e5a3280579
Component: engine
2014-09-29 14:34:48 -04:00
de785f1386
Documenting Container Tty resize api
...
Addresses #7840
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: c7f3fdc629dd654af2fc795c1f3fa1acdaf2552f
Component: engine
2014-09-26 16:26:21 +00:00
c5b4eb76ec
Add the 2 image events found using git grep 'Job("log"'
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 71e28f9d645ce3e216f87ad0a56c2800ec98155d
Component: engine
2014-09-26 11:55:36 +10:00
d8fc51798c
The list of events that 'grep' told me about
...
docker(master) $ git grep 'LogEvent("' | sed 's/.*("//' | sed 's/").*//'
| sort | uniq | paste -s -d","
create,destroy,die,export,kill,pause,restart,start,stop,unpause
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 05060a7c9496056fb792330027b7a73aec192697
Component: engine
2014-09-26 11:25:36 +10:00
55f5c84e4a
Merge pull request #8101 from jfrazelle/6974-correct-ct-json-stream
...
Change content-type for json stream to application/x-json-stream.
Upstream-commit: 42ec80bec02b7cb921397fc79ca58a18190e2c4b
Component: engine
2014-09-23 11:24:31 -07:00
b44c9bd465
Apply @tedyoung's changes to the entire set of API docs.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: ab43ad7d5fa8361736446af323c1fce77f150296
Component: engine
2014-09-23 10:09:49 +10:00
6bc23af935
Misc. fixes and formatting clean-up
...
Cleaned up and corrected some invalid "example responses".
Added some missing double-quotes for examples that resulted in invalid JSON.
Other general cleanup of stray characters and typos.
Docker-DCO-1.1-Signed-off-by: Ted M. Young <tedyoung@gmail.com > (github: SvenDowideit)
Upstream-commit: f304d4b190276939c9aff2090925342d16c7405e
Component: engine
2014-09-23 10:09:49 +10:00
7b47b2e708
Change content-type for json stream to application/x-json-stream.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 10ab2089ce189d5bea3f7aaac3b5081471309478
Component: engine
2014-09-22 10:29:56 -07:00
be7f27050e
Merge pull request #8061 from SvenDowideit/document-image-tarball-format
...
Add a little description of the image tarball format.
Upstream-commit: 82aa895c6dc592809d97284744dbd90c869097c5
Component: engine
2014-09-19 10:32:13 +10:00
d38719a9ac
Add a little description of the image tarball format.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: db9f8ba55cf2293f590ea5d129463ffc9a4eb23d
Component: engine
2014-09-18 10:40:55 +10:00
44cb0660ec
Merge pull request #8081 from abh1nav/master
...
Update remote_api_client_libraries.md
Upstream-commit: e9b5acba4b7a0a21e030b775b82351189367eb41
Component: engine
2014-09-18 10:24:53 +10:00
8f5fad7c3d
Merge pull request #8025 from davidpelaez-forks/docs-fix
...
Improved X-Registry-Auth content instructions
Upstream-commit: c7c78acf815c081ca56616a8b4c145217329f5e3
Component: engine
2014-09-18 09:54:25 +10:00
24cc16b5b6
Update remote_api_client_libraries.md
...
Ordering all clients alphabetically, by language.
Including all available languages in `page_keywords`.
Signed-off-by: Abhinav Ajgonkar <abhinav316@gmail.com >
Upstream-commit: ad65930d0bda1026a02efd18e9f6c70dfdae4fb6
Component: engine
2014-09-17 03:42:57 -04:00
56a385e489
Improved X-Registry-Auth content instructions
...
Hi,
this is a small contribution to fix some slightly unprecise information about the `X-Registry-Auth` header required to pull from private registries through the remote API. After a lot of trial and I error I managed to find that the documentation indications had this issues:
* Apparently single quotes cannot be used and double quotes (regular JSON) is required.
* Also the `auth` key must be passed even if empty or a 403 will result.
* It was not clear what the `serveraddress` had to be.
I added some small clarifications for anyone taking a look at the docs to keep them from the problems I've encountered. Hope this is helpful.
Thanks to all the contributors for bringing so much awesomeness to the linux world. :)
Signed-off-by: David Pelaez Tamayo <hello@davidpelaez.me >
Upstream-commit: 8c2b170c6ef3f8ec40c3a1bd6fdfc37f9271852a
Component: engine
2014-09-16 19:20:47 -05:00
9aa50abf75
Add some documentation for the RestartPolicy feature.
...
Signed-off-by: Jean-Paul Calderone <jean-paul@clusterhq.com >
Upstream-commit: d758da386a12598533f2388f2887091465c2efd8
Component: engine
2014-09-16 17:40:56 -04:00
abfdc34927
Merge pull request #8056 from SvenDowideit/use-sudo-docker-everywhere
...
Consistently use 'sudo docker' in examples
Upstream-commit: b64558907139911b86d846de70ab859504cc45a2
Component: engine
2014-09-16 08:43:58 -04:00
0fd379bbda
Added missing 't' from the end of the /images/{{id}}/get eg.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 4352ea7b0a746f00c29fb1170e893242cb8612ef
Component: engine
2014-09-16 15:27:44 +10:00
cd4d60a084
Consistently use 'sudo docker' in examples
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: fc9a3b1c1b835c170a4916362855e127a0e366e1
Component: engine
2014-09-16 11:49:05 +10:00
1bc2448cc5
Merge pull request #8037 from unclejack/shrink_docs_images
...
docs: shrink images
Upstream-commit: 62b86613e8c6bb8fa1c50fd30a92c050ffbed88e
Component: engine
2014-09-16 10:13:03 +10:00
084a5b1c3f
Change the copy command Content-Type header to x-tar
...
Addresses #6107
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 788e4acaa3883bc7369f9462f107266b41c59746
Component: engine
2014-09-15 10:45:06 -07:00
c3fe53e47f
docs: shrink images
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 90dcc7c8405437a10b81e932b49a856502cee626
Component: engine
2014-09-15 14:46:29 +03:00
5d83fcb509
HTTP Status 201 not 200
...
The http status should be 201 not 200.
Docker-DCO-1.1-Signed-off-by: Erik Kristensen <erik@erikkristensen.com > (github: SvenDowideit)
Upstream-commit: c4db3b8075ab4b8bd0c6599cb19e09eb77c82946
Component: engine
2014-09-15 10:58:45 +10:00