c22c23bfc2
Merge branch 'master' into list_container_processes-feature
...
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
9e16e5309d
Issue #1087 Docker Java API client -- added java to Docker Remote API Client document
...
Upstream-commit: aa9bec96b1d3aedcb67e6985ae5754e728665407
Component: engine
2013-07-01 11:28:40 -07:00
ab729772a8
change to top
...
Upstream-commit: 11e28842ac74ad0b706d24ec639952f78e9a147c
Component: engine
2013-07-01 15:19:42 +00:00
867f33af50
fix status code in doc
...
Upstream-commit: 8dcc6a0280720237008e36e893028032cd66aa2a
Component: engine
2013-07-01 13:28:58 +00:00
5783230d1b
Add doc
...
Upstream-commit: 8589fd6db8d52f93ba64a0d72c6eebe8d50530f6
Component: engine
2013-06-28 18:05:41 +02:00
a223caa9e6
+ Runtime: mount volumes from a host directory with 'docker run -b'
...
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
b1a130438c
Added Swipely's docker-api gem to the table of Remote API Client
...
Libraries.
Upstream-commit: d03edf12e4ad67f0900434af5c8d36688b6cc2a4
Component: engine
2013-06-25 08:26:41 -04:00
3f92ee019d
merge master and add doc
...
Upstream-commit: 4d1692726b5e7cfc1b58245afc48c1591724369f
Component: engine
2013-06-22 01:08:20 +02:00
9d597b11de
Merge pull request #848 from dotcloud/builder_server-3
...
Improve Docker build
Upstream-commit: de1a5a75cc5ae9d1084885d810d5715ee900f16d
Component: engine
2013-06-21 14:55:08 -07:00
b6d1924c7d
Update api docs
...
Upstream-commit: d0fa6927f8ad87e73a02f64ae9d6db6a820c1f4c
Component: engine
2013-06-21 13:51:48 -07:00
32f89c6b42
Merge branch 'master' into fix-auth
...
Upstream-commit: 8f2a80804ce6f3ab77057a25180a27e3b346778b
Component: engine
2013-06-21 09:18:03 +00:00
b15d1e7cb5
fix doc post
...
Upstream-commit: 8e7d4cda078482b84836f51e3e7ce17aa0f65217
Component: engine
2013-06-21 11:13:13 +02:00
7c517d635a
Merge branch 'simpler-build-upload' ( #900 ) into builder_server-3 ( #848 )
...
Upstream-commit: 352991bdf4c0a7702fcc791b961a516fb684f4c1
Component: engine
2013-06-20 22:02:36 -07:00
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
61d11ddffb
Merge branch 'master' into builder_server-3
...
Conflicts:
buildfile.go
Upstream-commit: 34a434616a7056a89328348ce3f92afd2730c777
Component: engine
2013-06-18 16:12:30 -07:00
0c8eff63fa
Update documentaiton
...
Upstream-commit: 84ceeaa8708293de81765a0f854952a74d191024
Component: engine
2013-06-18 14:36:35 -07:00
017e4a61cb
Fix merge issue
...
Upstream-commit: 6e17cc45eabf6d094241fc3e017a90da8ba6f5d9
Component: engine
2013-06-18 12:33:06 -07: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
726da1690f
Merge branch 'master' into builder_server-3
...
Conflicts:
utils/utils.go
Upstream-commit: 78f86ea502694bf5dbc947802ebc0f5e5426d15c
Component: engine
2013-06-14 17:08:39 -07:00
2a4a4027de
update docs, remove config file on 401
...
Upstream-commit: 90f6bdd6e41ec352009ffbd073c1f45983abb74b
Component: engine
2013-06-14 13:38:51 +00:00
b78bf5bb71
update docs
...
Upstream-commit: e49f82b9e1a920c902c1cd813596dc1a78817e63
Component: engine
2013-06-14 10:10:26 +00:00
18df81b8e1
Merge branch 'master' into builder_server-3
...
Conflicts:
buildfile.go
commands.go
docs/sources/api/docker_remote_api.rst
Upstream-commit: 4b4918f2a78c129c4ca745147fd38f985d2635c2
Component: engine
2013-06-13 18:11:22 -07: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
f2a91760de
Update documentation for docker build
...
Upstream-commit: 2cc22de696d5a0847ecd7d07eaee1d7f385dd29c
Component: engine
2013-06-06 16:48:36 -07: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
