a4e9bba7a3
Merge branch 'master' into simpler-build-upload
...
Conflicts:
api.go
builder_client.go
commands.go
Upstream-commit: e43323221b15d90956a200754bbf3e1d92d7bb1c
Component: engine
2013-06-20 14:19:09 -07:00
f26e4fdaf0
Fixed API version numbers in api docs
...
Upstream-commit: cff2187a4ccf90a5be821c316b564e934d80998c
Component: engine
2013-06-20 12:30:02 -07:00
eb87dc37e0
Merge branch 'master' into simpler-build-upload
...
Upstream-commit: 79efcb545d76970843e02c48492a61450dba5564
Component: engine
2013-06-19 18:48:19 -07:00
f576f996f6
* Remote API: updated docs for 1.3
...
Upstream-commit: d6ab71f450ac3673ffd4bc806de23e42a6d32c07
Component: engine
2013-06-19 15:03:33 -07:00
901aace697
Merge branch 'master' into add_unix_socket-feature
...
Upstream-commit: d52af3f58f26c1bf1ea61af532385965434373eb
Component: engine
2013-06-19 12:49:27 +00:00
bdd6ad8a7a
update docs
...
Upstream-commit: 063c838c927615e9507eca2a5c2f38a5fc4c35b2
Component: engine
2013-06-19 12:48:50 +00:00
531f894fab
* API: Send all tags on History API call
...
Upstream-commit: 808faa6371c470fa0765f5d4e3aed7708d8f9ee6
Component: engine
2013-06-18 10:31:07 -07:00
176d1b39a4
Update documentation
...
Upstream-commit: 02a002d264faa7b8cdf5c68b7370c31d6794a44d
Component: engine
2013-06-17 18:41:13 -07:00
b78bf5bb71
update docs
...
Upstream-commit: e49f82b9e1a920c902c1cd813596dc1a78817e63
Component: engine
2013-06-14 10:10:26 +00:00
4147a474f5
rebase master
...
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
2013-06-13 17:58:06 +00:00
9efccead8d
Merge branch '610-improve_rmi-feature'
...
* Runtime: improved image removal to garbage-collect unreferenced parents
- Runtime: fixed image removal to cleanly remove tags and repositories
Upstream-commit: 5ecfe13be9f8f47e27e5134e60d14d195a1baeaa
Component: engine
2013-06-12 20:30:07 -07:00
0a236e493a
bump to master
...
Upstream-commit: f2383151cbcc727450f87cb80a392e2858d4b0ca
Component: engine
2013-06-12 17:39:32 +00:00
3ff2998841
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: b4565af25657aa28d1cc9c740c82700c5ec6ce8b
Component: engine
2013-06-12 10:23:14 -07:00
2ebddf1907
Merge pull request #853 from kencochrane/registry-api-1.1-fix
...
* Documentation: separate the registry and index API's into their own docs
Upstream-commit: 092c761cec2e89f73c3810ff8f2f4ffb01db53b0
Component: engine
2013-06-11 18:34:10 -07:00
040fa0beff
Added a readme explaining the role of each API
...
Upstream-commit: d64f105b44d202aeb83a5f4edbdffdf2375992fa
Component: engine
2013-06-11 10:39:02 -07:00
604adb2ef8
* Remote Api: Add flag to enable cross domain requests
...
Upstream-commit: 20bf0e00e81fdff34c821fd880a92e822fb5ba15
Component: engine
2013-06-11 10:12:36 +00:00
ec363b1d2d
Add links to libraries, fix #800
...
Upstream-commit: ca4597e9d74474e4211cee9bf48513643a28fdf9
Component: engine
2013-06-10 15:22:34 -07:00
b4019d7d98
Add list of Docker Remote API Client Libraries. Fixes #800 .
...
Upstream-commit: eeea9ac9468a73bb9514a2d729060889b48384ee
Component: engine
2013-06-10 15:17:27 -07:00
2bcee3140c
rebump
...
Upstream-commit: 66d9a733622ba9a8f9671bac7d33776981672940
Component: engine
2013-06-10 21:05:54 +00:00
49bbfc9be5
docs/api/remote: fix rst syntax in the "Search images" section
...
Upstream-commit: b1ed75078ea04de8725ce5c39ae3b463f86faf4e
Component: engine
2013-06-10 16:07:57 -03:00
94dc3255e0
seperated the registry and index API's into their own docs
...
seperated the registry and index API's into their own docs and merged
in the index search api into the index api. Also renamed the original
registry api to registry_index_spec.
Upstream-commit: 9e1cd37bbc2a1017612ea03e24a8002e6e81e1ea
Component: engine
2013-06-07 13:42:52 -04:00
0ba1139399
bump to master
...
Upstream-commit: ce0041832c95f9a1d4ea407c3a3c78d8ae08df61
Component: engine
2013-06-05 15:30:45 +00:00
d64fde4d70
updated doc
...
Upstream-commit: 62551129263e339d7ca9c21afbd4eda16452c6da
Component: engine
2013-06-05 13:19:57 +02:00
0b2167b3b8
fix progress message in client
...
Upstream-commit: 3922691fb99a99cec0a5d239da522cc3d8778e6c
Component: engine
2013-06-04 16:09:08 +00:00
19f2b9dadf
Add flag to enable cross domain requests in Api
...
Add the -api-enable-cors flag when running docker
in daemon mode to allow CORS requests to be made to
the Remote Api. The default value is false for this
flag to not allow cross origin request to be made.
Also added a handler for OPTIONS requests the standard
for cross domain requests is to initially make an
OPTIONS request to the api.
Upstream-commit: 6d5bdff3942ce5e030b2cbd1510f418de25a1a53
Component: engine
2013-06-03 21:39:00 -04:00
db19220e91
removed auth in pull
...
Upstream-commit: 7e59b83053bceb683a198786290bc61da81581be
Component: engine
2013-06-03 17:51:52 +00:00
d1a021f5ce
Merge pull request #772 from dotcloud/improve_version_info_cmds
...
* API: Improve version info cmds
Upstream-commit: 0443cc351d1202063c79a4de5497878f9a9e674e
Component: engine
2013-06-03 06:36:09 -07:00
a5e3ae8f4a
bump master
...
Upstream-commit: ca902b6be4cb04f3f885af750609f74effd75d3d
Component: engine
2013-06-03 12:37:51 +00:00
f6d51d4fe0
added docs and moved to api version 1.2
...
Upstream-commit: 3dd1e4d58c9d676d49f41db450c3d42901526edc
Component: engine
2013-06-03 12:09:16 +00:00
59649c5a44
Merge pull request #787 from gasi/nodejs-centos-docs
...
* Documentation: Deploying a Node.js Web App on CentOS
* Documentation: small formatting improvements
Upstream-commit: cebfde9ea550677d596520448f43cde6de3605c0
Component: engine
2013-06-02 23:27:29 -07:00
aee770cf4d
Fix typo
...
Upstream-commit: f6f345b1fe0ecc1adba449b0078d96388dd48892
Component: engine
2013-06-01 21:55:01 -07:00
934fcbd514
Merge pull request #719 from dotcloud/json_stream-feature
...
* API: push, pull, import, insert -> Json Stream
Upstream-commit: 9bc71c101c8f1299427013bfb5503bf85173c28f
Component: engine
2013-05-31 16:05:15 -07:00
4c4d21a4a1
Update api docs
...
Upstream-commit: f41d2ec4d91f2fa1dc479d8bac32113fbb7e987e
Component: engine
2013-05-31 15:56:30 -07:00
9e1e927a3a
Merge pull request #766 from dotcloud/prevent_attach_stopped_container-feature
...
returns an error if the container we want to attach is not running
Upstream-commit: 7d167590bc0d35edf6b0a77ef01b340685108545
Component: engine
2013-05-31 14:41:57 -07:00
8205a10135
Merge pull request #753 from dotcloud/registry_api_remove_teams
...
Remove teams from the registry API
Upstream-commit: 76bb920449f727bfc05c322f78585f9b330ba354
Component: engine
2013-05-31 12:41:12 -07:00
3efe0a345b
returns an error if the container we want to attach is not running
...
Upstream-commit: 468e4c4b565d25b03c68ce2ab31f9a52f7b3398a
Component: engine
2013-05-31 15:34:23 +00:00
0dcec39d12
add -t parameter in the doc
...
Upstream-commit: 2baea2487936c3d385671d25ab3ef1b09f9007cc
Component: engine
2013-05-31 14:40:09 +00:00
799ca20158
added proper returns type, move the auto-prune in v1.1 api
...
Upstream-commit: 9060b5c2f52d29dec1920eb89ee0d48341540e3b
Component: engine
2013-05-31 14:37:02 +00:00
bc3ec475fa
Remove special case for 'teams' from registry api
...
Upstream-commit: 531b30119ab5422f9f34ebf3be1a6b6578ded9f1
Component: engine
2013-05-30 11:37:58 -07:00
06534c45f7
bump to master
...
Upstream-commit: f339fc2eb921986749a628b92d2c9f2ecf47e3c2
Component: engine
2013-05-29 13:52:18 +00:00
9c8c6a4ab3
merge master
...
Upstream-commit: ea9095c5626077c198e3fdbb480d6205851f027b
Component: engine
2013-05-29 11:49:39 +00:00
d4ee5e174d
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 83db1f36e30ff2188ee3cf5908b65534e693654e
Component: engine
2013-05-28 19:39:20 -07:00
52887551f6
Documented who decides what and how.
...
Upstream-commit: 24ddfe3f25f99db5a23f62d411c949b2236288a1
Component: engine
2013-05-28 19:39:09 -07:00
a20c31a039
rename containers/ps to containers/json
...
Upstream-commit: 4f9443927e8bc8a724b43afae6cf7a183cd9acd0
Component: engine
2013-05-28 16:08:05 +00:00
663bde65c3
documentation
...
Upstream-commit: 8699805756d25602e2412173aac7364fbe9627c7
Component: engine
2013-05-28 15:49:57 +00:00
9a8934c1af
Fix attach API docs.
...
Upstream-commit: 7d6ff7be129d70f0ff5c50a47d70a32a1e6274bc
Component: engine
2013-05-28 06:27:12 -07:00
fdc407078f
* Registry: specified naming restrictions for usernames and repository names
...
Upstream-commit: df23a1e675c7e3cbad617374d85c48103541ee14
Component: engine
2013-05-24 18:58:24 -07:00
1ac07a6fad
Merge pull request #683 from rogaha/doc_meta_info_update
...
Looks good. Thanks! Closes #637
Upstream-commit: 422edd513a5e1ea30ea65352af213af7856a661e
Component: engine
2013-05-22 19:09:32 -07:00
7040df6614
added/modifed tittle, description and keywords
...
changed the title prefix to sufix + Documentation
Upstream-commit: 18cb5c9314dbc9a0aa857211b124a3feb85c5274
Component: engine
2013-05-22 17:52:48 -07:00
e974a23746
fix content type in doc
...
Upstream-commit: 949a649cc2364f796daae14fa3b044432e25efdf
Component: engine
2013-05-22 13:49:12 +00:00
