Commit Graph

580 Commits

Author SHA1 Message Date
80d0a74f8b clarify "use"
Upstream-commit: cd289cc10ccefea72206a6f262e978c346c6679a
Component: engine
2013-09-13 17:22:53 -07:00
32f8da3a7e Merge pull request #1880 from getvictor/patch-api
Fixed LxcConf example in Remote API v1.4 and v1.5
Upstream-commit: 894eff64b499b2df5d7eadca55f2ea2feee7c380
Component: engine
2013-09-13 13:28:26 -07:00
4b16804ae0 Change apt source to http
Upstream-commit: 74daeccec580c27c33c982cd246afc537f2804be
Component: engine
2013-09-13 19:21:43 +00:00
262f4e57a2 Fixing LxcConf example in docker_remote_api_v1.4.rst
Upstream-commit: 102522bcd1e87730394665c5a78f8e8bbcc50b7e
Component: engine
2013-09-13 14:10:05 -05:00
40a7f3c469 Fixed LxcConf example for docker_remote_api_v1.5.rst
Based on how command line docker sends the request.
Upstream-commit: b3cbf424ec7dbce8a42f75b23f48083f3f62abaf
Component: engine
2013-09-13 14:09:05 -05:00
4de754b9f6 Merge pull request #1848 from dotcloud/build-clean
Add rm option to docker build to remove intermediate containers
Upstream-commit: 33972627b7feb7bddce87e92d3789de6eb4611ef
Component: engine
2013-09-13 10:58:59 -07:00
dec68f5c30 Merge pull request #1593 from kyleconroy/master
Enable mobile view for website.
Upstream-commit: 83623675ceba17a5dcc283010f8e7f53f0910a4a
Component: engine
2013-09-12 10:30:16 -07:00
909728c3a8 Merge pull request #1865 from lgp171188/patch-1
Fixed a minor typo
Upstream-commit: 46f644c074ac2f0b30cba608db32995ee2f02551
Component: engine
2013-09-12 10:11:18 -07:00
bd04c634f0 Merge pull request #1859 from Bachmann1234/patch-1
Fix typo in hello_world.rst
Upstream-commit: 1bc2ab05ec244935a5219fdc827f62e911dee37a
Component: engine
2013-09-12 10:10:49 -07:00
efc88e6663 Add rm option to docker build to remove intermediate containers
Upstream-commit: b7a3fc687ec55b68ee0cadf78d7f1eff3e531fbd
Component: engine
2013-09-12 16:55:36 +00:00
424f44ba41 Fixed a minor typo
Changed "You need to enable namespaces and cgroups, to the extend of what is needed to run LXC containers" to "You need to enable namespaces and cgroups, to the extent of what is needed to run LXC containers"
Upstream-commit: 718b1f9fe74f3a26881e462b3e9e91a93232568b
Component: engine
2013-09-12 13:25:05 +05:30
de832f166e Merge branch 'master' of https://github.com/dotcloud/docker
Upstream-commit: 9dd98df1a3c4115da897b93809d0b004b8fccc1a
Component: engine
2013-09-11 15:38:52 -07:00
f3b949b816 Update hello_world.rst
Small typo
Upstream-commit: dfe45e1ad5fe741c379c5549c9ea56ec440d2579
Component: engine
2013-09-11 15:35:05 -04:00
ee4708b50c Fix #1601 with vagrantless installation instructions.
Upstream-commit: 21be3b76e99d0a6a9d9722d6221ee15ea971dbf4
Component: engine
2013-09-10 18:54:13 -07:00
70b97c6387 Fix #1845 lxc typo in images
Upstream-commit: c75926be4f1a606251c6cdc926c5a37795d358b9
Component: engine
2013-09-10 14:54:35 -07:00
3c51fffb9b Merge pull request #1835 from metalivedev/1821-exampleslanding
fix #1821 landing page for examples
Upstream-commit: de75241b627730a24e4db59ddb5bc06ba27bffac
Component: engine
2013-09-10 14:14:00 -07:00
f16ec54fce Merge branch 'master' of https://github.com/dotcloud/docker
Upstream-commit: c24c5c3b6004edd31c1fd503125b1ba150c2e23a
Component: engine
2013-09-10 10:57:33 -07:00
108dc7f51c Merge pull request #1796 from shin-/api_1_5
*Remote API: Bumped API version to 1.5
*Registry: Implement login with private registry
*Remote API: Improve port mapping information 
Upstream-commit: 2801624462a4b3842930d38b09a5039629d1a5d3
Component: engine
2013-09-09 16:58:54 -07:00
f14e5c017d Merge pull request #1828 from mmikulicic/patch-1
Please add go-dockerclient to docker API clients doc
Upstream-commit: 8ddfb4d6aa43de31e2043fd86dcefb0ed4f591b0
Component: engine
2013-09-09 14:51:28 -07:00
94007cc5e6 remove docker-ruby from docs
we don't maintain it anymore as we now recommend proper HTTP api based clients instead.
Upstream-commit: 3c90e96b6d9e16b3983cd7e387b06e81130f1e7c
Component: engine
2013-09-09 14:42:45 -07:00
9cb316385e Merge pull request #1773 from hectcastro/hc-riak-example
Add a Docker example for running Riak
Upstream-commit: 0508bd8da78af21fef74cb45993f60f188eeac39
Component: engine
2013-09-09 13:31:41 -07:00
bdd7f084cd Merge pull request #1807 from tianon/gentoo-docs
Update Gentoo docs to reflect the package name change from app-emulation/lxc-docker to app-emulation/docker
Upstream-commit: c66a827c98027ce5e3b4ebe83f8b2143e2a62d8b
Component: engine
2013-09-09 13:27:48 -07:00
122c44caef Created a little landing page for the examples, combined first two.
Upstream-commit: fe99e51634f7068ce997e9866516f2b14a93bda9
Component: engine
2013-09-09 13:19:07 -07:00
fe18d490b4 note about exiting from attachment prior to running
Upstream-commit: 9749d94fb0f3034247dbd969f6dad390f2605e1a
Component: engine
2013-09-09 10:30:06 -04:00
04edea7666 improve sentence readabilty
Upstream-commit: 630ae43e7d11fa34421a253c765edb6cef5a3371
Component: engine
2013-09-09 10:19:45 -04:00
6d96bcd64c Please add go-dockerclient to docker API clients doc
Upstream-commit: 268928ab35a5402ff37413ab258200c4bed48790
Component: engine
2013-09-09 11:01:15 +01:00
796b8f393b Add Swiftype search to docs
Upstream-commit: 03a28da5f78bd0f20eca3390a2dddca4ccb6ca81
Component: engine
2013-09-06 13:34:24 -07:00
e7babc83eb fix indent in doc
Upstream-commit: 20a763e51934f3b52e48b5a6ba37d63852fd9a0b
Component: engine
2013-09-05 22:33:04 +00:00
e904047138 Detect images/containers conflicts in docker inspect
Upstream-commit: 5ec2fea6dd3360de326717ed01909b8fe9c39d0f
Component: engine
2013-09-05 22:31:17 +00:00
cab30800ec Update Gentoo docs to reflect the package name change from app-emulation/lxc-docker to app-emulation/docker as discussed in today's #docker-meeting
Upstream-commit: d368c2dee99b35830392938a783137f344e5b89a
Component: engine
2013-09-05 13:36:56 -06:00
5d9b381364 Reformat Gentoo install instructions to 80 columns
Upstream-commit: 82dd417ef6966b0f3d812122c18420feb64f49a7
Component: engine
2013-09-05 13:36:16 -06:00
caf639fe57 Fix memory recommendations (Byte, not bit)
Upstream-commit: fdf1fccd3eec7b534b8423fe3ea5b6e116b233fa
Component: engine
2013-09-05 10:40:11 +02:00
b0525903e4 Merge pull request #1801 from vcoisne/master
Add step to docker installation using vagrant (Mac, Linux)
Upstream-commit: f0cdbaa6c8810954c1e41a07ba78e03305c1cfa2
Component: engine
2013-09-04 18:15:22 -07:00
c744f81e56 Merge pull request #1789 from tommyblue/patch-1
Adds instruction about UDP port redirection
Upstream-commit: e0d6bae1eb2cc2991fda1a11b939dbe4a6466680
Component: engine
2013-09-04 18:14:34 -07:00
9ce0173846 Add step to docker installation using vagrant (Mac, Linux)
Upstream-commit: ad04cacd28da1557324b8ad6fb53b7284e8bf866
Component: engine
2013-09-04 17:47:18 -07:00
99fc9c9d22 fixed docs for installing binary
Upstream-commit: 62823cfb97ec35e59833fd4723c392685d55827c
Component: engine
2013-09-05 00:06:41 +02:00
26060f559c Updated docs for API v1.5
Upstream-commit: 98edd0e7510183f561716307299be8834617917b
Component: engine
2013-09-04 22:58:58 +02:00
5d2c4cd78f Merge branch '1357-implement-login-with-private-registry' of git://github.com/mhennings/docker into mhennings-1357-implement-login-with-private-registry
Upstream-commit: 34edbd4f7e0ca43325e067c925809ab531f561a5
Component: engine
2013-09-04 22:26:55 +02:00
7b3fcf5ca5 Typo
Upstream-commit: 396274fa6db88466fef0b1a5e314ba5b077cd3f2
Component: engine
2013-09-04 21:56:51 +02:00
a8f84352af Adds instruction about UDP port redirection
Upstream-commit: ad5796de9febb5724bd2bf0639ae617c2ff34ba5
Component: engine
2013-09-04 19:17:10 +02:00
f7eb498730 Merge pull request #1784 from proger/patch-1
add new docker api client for erlang, erldocker
Upstream-commit: 58ea690b41b5a5fecd2cc5a44832c73ce83dd3a7
Component: engine
2013-09-04 10:01:29 -07:00
26753d6604 Merge pull request #1783 from briehanlombaard/typos
Fixed typos
Upstream-commit: 3b92ab34653513db3a682f96388823c8712f4ed3
Component: engine
2013-09-04 10:00:10 -07:00
8b97f99fc4 Merge pull request #1785 from thijsterlouw/update_commandline_cli
Fix documentation index for cli
Upstream-commit: 76f97a64faa8cbeab11334dc31d0b29a3b2d60c5
Component: engine
2013-09-04 09:59:30 -07:00
f4bdcf9337 Fix documentation index for cli
Upstream-commit: 368d0385e1d426a32da66135e7ff8d4f5a3c7a26
Component: engine
2013-09-04 13:21:44 +02:00
2844cc3031 add new docker api client for erlang, erldocker
Upstream-commit: 58ffd03bf16f41b9c954e61ef948768f44871c28
Component: engine
2013-09-04 12:53:38 +03:00
a2ac8a8fdc Add Gentoo documentation
Upstream-commit: 9ce1d02ef6b0593861809248307d058656f56304
Component: engine
2013-09-04 02:59:18 -06:00
af3ae4d1fc Fixed typos
Upstream-commit: 251d1261b0c2edfc8b014141cc03d32c30263226
Component: engine
2013-09-04 10:52:53 +02:00
b7cc10776d Add a Docker example for running Riak.
Upstream-commit: fac4cedcc105a7b5a6789917ddf9a5e9745bd2d3
Component: engine
2013-09-03 16:30:40 -04:00
e60a2a9f3c Login against private registry
To improve the use of docker with a private registry the login
command is extended with a parameter for the server address.

While implementing i noticed that two problems hindered authentication to a
private registry:

1. the resolve of the authentication did not match during push
   because the looked up key was for example localhost:8080 but
   the stored one would have been https://localhost:8080

   Besides The lookup needs to still work if the https->http fallback
   is used

2. During pull of an image no authentication is sent, which
   means all repositories are expected to be private.

These points are fixed now. The changes are implemented in
a way to be compatible to existing behavior both in the
API as also with the private registry.

Update:

- login does not require the full url any more, you can login
  to the repository prefix:

  example:
  docker logon localhost:8080

Fixed corner corner cases:

- When login is done during pull and push the registry endpoint is used and
  not the central index

- When Remote sends a 401 during pull, it is now correctly delegating to
  CmdLogin

- After a Login is done pull and push are using the newly entered login data,
  and not the previous ones. This one seems to be also broken in master, too.

- Auth config is now transfered in a parameter instead of the body when
  /images/create is called.
Upstream-commit: fcee6056dc50de7698772a3049cdfa1eb0f2416f
Component: engine
2013-09-03 20:45:49 +02:00
28c7f36af8 Merge pull request #1758 from mattapperson/patch-1
Added NodeJS library
Upstream-commit: 75df4953f4dda1ea53f8aa6be86f9e46069f1d5e
Component: engine
2013-09-03 11:02:34 -07:00