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
6b64f66055
Merge pull request #869 from fsouza/fix-api-docs
...
docs/api/remote: fix rst syntax in the "Search images" section
Upstream-commit: bcc4754dc14037224517e874acd36244953a705b
Component: engine
2013-06-10 14:21:39 -07:00
032df4df5a
Merge pull request #840 from dhrp/just-fixed-some-links
...
Fixed some links. Closes #839 #838 #835
Upstream-commit: 5712e37437ffcfbb17d75f7f9c977bf1d4013042
Component: engine
2013-06-10 13:51:43 -07: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
a1c85f2f28
Merge pull request #855 from samjsharpe/fix_missing_hyphen
...
Build from Dockerfile on stdin requires a hyphen
Upstream-commit: 956491f8534692f7e31cd4678b688678d6256414
Component: engine
2013-06-07 13:04:27 -07:00
f164baea45
Build from Dockerfile on stdin requires a hypen
...
There is a missing hypen in the documentation:
`docker build < Dockerfile` will complain
`docker build - < Dockerfile` will not complain
Upstream-commit: 5e6cd21f8b3bded9e9cba2e1b9a754df5a9c2bf2
Component: engine
2013-06-07 20:35:34 +01:00
177513451e
Merge pull request #827 from dotcloud/dev_environment_update
...
Update "Setting Up a Dev Environment" doc, with modern golang PPA and stable lxc kernel
Upstream-commit: 1cc4049e82263ee23e27cfae2900120aa87f50a5
Component: engine
2013-06-06 09:48:19 -07:00
11abae76ab
changed to 12.04 and add kernel
...
Upstream-commit: a118ad90edbb232806345c4038f3e9e68098648c
Component: engine
2013-06-06 12:36:28 +00:00
1dbf41a0b1
Fixed some links
...
* Added Google group to FAQ on docs
* Changed IRC link
* Fixed link to contributing broken by 326faec
Upstream-commit: 0f23fb949dd894ff70641cc01ac116aa55083157
Component: engine
2013-06-05 18:06:51 -07:00
106de1dac7
Merge pull request #817 from dhrp/blog-in-navigation
...
Modified the navigation in both website and documentaion to include the blog.
Upstream-commit: f1992eeea5d7945164f2732aea805ad3a06cc3b8
Component: engine
2013-06-05 17:28:19 -07:00
28f01e9e4d
update doc to newer go
...
Upstream-commit: e3cc625315ffdc47e6ea8d94812c7423853435b8
Component: engine
2013-06-05 13:19:49 +00:00
e1f455fc5a
bump to master
...
Upstream-commit: b4682e6707301b650f041b877db0ea0053a9b340
Component: engine
2013-06-05 10:19:51 +00:00
2fdc41e83d
Remove provider specifc language
...
Upstream-commit: c000ef194c0259bfe631222b19a2bc204281f836
Component: engine
2013-06-04 16:01:38 -04:00
0661d79fa2
Merge pull request #802 from johncosta/ubuntu-1304-add-apt-repository
...
- Documentation: adding missing dependency to the ubuntu linux install page.
Upstream-commit: 479ac9afa7159f2da7c9cb4dd33fef8a4cf85474
Component: engine
2013-06-04 11:55:34 -07:00
7b912efeab
Modified the navigation in both website and documentaion to include the Blog.
...
Upstream-commit: 716892b95dd292c62d9bc7ca2951176e94657b00
Component: engine
2013-06-04 11:41:54 -07:00
0b2167b3b8
fix progress message in client
...
Upstream-commit: 3922691fb99a99cec0a5d239da522cc3d8778e6c
Component: engine
2013-06-04 16:09:08 +00:00
f0b09674bb
some installations of ubuntu 13.04 (digital ocean Ubuntu 13.04 x64 Server in this case) require software-properties-common to be installed before being able to use add-apt-repository
...
Upstream-commit: e61af8bc62c84a1bc70d0b323c1b6bf21dddb4b6
Component: engine
2013-06-04 10:40:44 -04: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
82e1f15eb6
Changed some text on the website to include docker-club
...
Fixed a link in the FAQ on the docs
Fixed a detail in the Makefile for pushing the site to dotcloud
Upstream-commit: 38f29f7d0c9cbdb4c458834d403fc128dcce3117
Component: engine
2013-06-03 11:45:19 -07: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
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
43b70fa498
Document installation of npm dependencies /ht @grigio
...
Upstream-commit: 82dadc200593e39f0979159d46afccf64f1e7a83
Component: engine
2013-06-02 20:10:22 -07:00
a432f97e17
Add link at the beginning
...
Upstream-commit: 464765b940c8194c302b89891dc06b8fcc1b37ff
Component: engine
2013-06-01 22:16:26 -07:00
409c1d534a
Add Node.js web app example using CentOS
...
Upstream-commit: e9ffc1e49998d42f37b39cd23b56b73f7dc0e3da
Component: engine
2013-06-01 22:06:53 -07:00
657224f8b4
Use code blocks
...
Upstream-commit: 4fb9a6eafb981ed66fe547fe29c11525f40d0640
Component: engine
2013-06-01 22:03:41 -07:00
a6d08b401d
Name examples consistently
...
Upstream-commit: 157547845acd8a0633df72e01d22bad9cbec578b
Component: engine
2013-06-01 22:03:28 -07:00
74278bf53f
Use title case for consistency
...
Upstream-commit: 2935ca7ee2879723c786b86ee87cc1be26dad7b8
Component: engine
2013-06-01 22:03:12 -07:00
445dfaf8b1
Use em dash in title
...
Upstream-commit: 23452f1573e7887b638a4e69a4cf90d757921885
Component: engine
2013-06-01 22:02:24 -07:00
aee770cf4d
Fix typo
...
Upstream-commit: f6f345b1fe0ecc1adba449b0078d96388dd48892
Component: engine
2013-06-01 21:55:01 -07:00
cf5d33839b
Add more tags
...
Upstream-commit: e3fd61ad74521b1a94502cf8dcc7c450f035c168
Component: engine
2013-06-01 21:27:27 -07:00
4902d73b72
Make style consistent
...
Upstream-commit: 01ce63aacdd975130244f4be70bc90736e85d457
Component: engine
2013-06-01 21:26:58 -07:00
fef5363d7d
Add Mac OS X instructions for doc tools
...
Upstream-commit: 3ca9c11110ff5068fd453a3e8aa0b39ee26d363c
Component: engine
2013-06-01 21:26:18 -07:00
76d5aac68b
Add make server command to preview docs
...
Upstream-commit: b4df0b17afef027e88f0536cbfc9518e04f62eec
Component: engine
2013-06-01 21:25:51 -07:00
2fce4aa919
Spelling correction in docs
...
Upstream-commit: 7f65bf508e5930df48e3e3de2ed9a5a62a66446c
Component: engine
2013-06-01 21:48:32 -04: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
86f679c012
Fix minor documentation error in ‘Running Redis Service’ example
...
Upstream-commit: fd0c501e6d65b665cba87f3449e02a722d90e6b1
Component: engine
2013-05-31 12:19:49 -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
919fd1400e
Merge pull request #745 from rogaha/doc_ssh_service_example_uptd
...
Add screencast summary. Makes it easy to reproduce steps.
Upstream-commit: 1c091657d44784a049b115892bd6ff812268688b
Component: engine
2013-05-30 18:49:32 -07:00
fcc4d17c47
Merge branch 'master' into builder_server-2
...
Upstream-commit: 4205b6bb1dfa06b70e969286ac911f744a88cb81
Component: engine
2013-05-30 14:09:42 -07:00
fc9613526d
Update docker build docs
...
Upstream-commit: 28d5b2c15acc6e088a0abd2099a00ba1180beb3e
Component: engine
2013-05-30 12:35:19 -07:00
d94ac95c85
Merge pull request #747 from riccieri/patch-1
...
+ * Documentation: add IP forwarding config to archlinux guide
Upstream-commit: 5324614410efc2e69d6f78a78763fde6bc3cba2d
Component: engine
2013-05-30 11:59:53 -07:00
bc3ec475fa
Remove special case for 'teams' from registry api
...
Upstream-commit: 531b30119ab5422f9f34ebf3be1a6b6578ded9f1
Component: engine
2013-05-30 11:37:58 -07:00
3224305e04
* Documentation: removed 'building blocks' for now.
...
Upstream-commit: 2ed1092dad9d2dec30945b06572befbba003ed1d
Component: engine
2013-05-30 11:26:47 -07:00
