236805a6b0
Merge pull request #1803 from dotcloud/1802-skip-TestGetContainersTop
...
testing, issue #1802 : Temporarily skip TestGetContainersTop
Upstream-commit: 908bb65dcf7f8a2d5e04de862e3908b46529d6a1
Component: engine
2013-09-05 14:44:47 -07: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
3306a42bfc
Merge pull request #1804 from Bouke/patch-1
...
Fix memory recommendations (Byte, not bit)
Upstream-commit: b57d7dca9de306d9372dfde6cd736aef1c4416e1
Component: engine
2013-09-05 11:52:00 -07:00
85199fa5e3
Merge pull request #1772 from dotcloud/update-tar-revision
...
Update tar pkg revision number
Upstream-commit: 8e411815915d706f69ea344ba142cb96c89650ff
Component: engine
2013-09-05 10:32:53 -07:00
caf639fe57
Fix memory recommendations (Byte, not bit)
...
Upstream-commit: fdf1fccd3eec7b534b8423fe3ea5b6e116b233fa
Component: engine
2013-09-05 10:40:11 +02:00
a096f499a1
testing, issue #1802 : Temporarily skip TestGetContainersTop
...
Upstream-commit: bf6e241d977f36db57c66a5b8dd056b36c0d8695
Component: engine
2013-09-04 18:20:49 -07: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
5c10539e0f
Merge pull request #1797 from denibertovic/docs
...
fixed docs for installing binary
Upstream-commit: d6ff912917f350ee728a2df419167d3b64904979
Component: engine
2013-09-04 18:13:25 -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
14f3a4d119
Bumped API version in api.go ; added <1.5 behavior to getContainersJSON
...
Upstream-commit: 9ae5054c3477c6eb9afc64ad44ff41bb3f10a8ab
Component: engine
2013-09-04 23:41:44 +02:00
f646963f0f
deployment, issue #1578 : Avoid pinning kernel headers. Add Vagrantfile assumptions
...
Upstream-commit: 8878943ac9ab3b3344d398b45e68ebb7cea879f0
Component: engine
2013-09-04 14:41:09 -07:00
8b061345d8
Merge pull request #1578 from jimmycuadra/vagrant-provider-detection
...
Better VirtualBox detection in Vagrantfile
Upstream-commit: 8e3844cd343c5939d85603505ff94ca7e48eed8f
Component: engine
2013-09-04 14:40:32 -07:00
230044d44e
Merge pull request #1795 from eliasp/patch-1
...
Typo
Upstream-commit: 1a32c4a1df0c16be16d40660bdad0fee67cfa7c6
Component: engine
2013-09-04 14:13:52 -07:00
26060f559c
Updated docs for API v1.5
...
Upstream-commit: 98edd0e7510183f561716307299be8834617917b
Component: engine
2013-09-04 22:58:58 +02:00
b1857983d6
Merge branch 'mhennings-1357-implement-login-with-private-registry' into api_1_5
...
Upstream-commit: 98a1314251cf5d0ffe0f9d44055e8e73ff368947
Component: engine
2013-09-04 22:27:04 +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
89239ee795
Merge branch 'better_api_ports' of git://github.com/shin-/docker into shin--better_api_ports
...
Upstream-commit: 2ea52dddec97c26bfcb1d9837a1dae0a9974e14c
Component: engine
2013-09-04 22:25:01 +02:00
7b3fcf5ca5
Typo
...
Upstream-commit: 396274fa6db88466fef0b1a5e314ba5b077cd3f2
Component: engine
2013-09-04 21:56:51 +02:00
1cee01680e
Don't install VirtualBox Guest Additions if VAGRANT_DEFAULT_PROVIDER is set.
...
Upstream-commit: 28e75b23b39aa0aee951378bf1039886c00f7783
Component: engine
2013-09-04 11:21:24 -07:00
a8f84352af
Adds instruction about UDP port redirection
...
Upstream-commit: ad5796de9febb5724bd2bf0639ae617c2ff34ba5
Component: engine
2013-09-04 19:17:10 +02:00
4dcb5ed317
Merge pull request #1788 from dotcloud/1787-deprecate-port-forwarding
...
deployment, issue #1787 : Remove deprecated port forwarding from /Vagrantfile
Upstream-commit: 3a6868bc2fa1e1cd76ae8691c68cb96c857ff265
Component: engine
2013-09-04 10:11:12 -07:00
61c8f585f5
deployment, issue #1787 : Remove deprecated port forwarding from /Vagrantfile
...
Upstream-commit: 34145f9840b62de85d385a65702f054962878cae
Component: engine
2013-09-04 10:05:54 -07: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
5e3e233f53
Merge pull request #1782 from tianon/gentoo-docs
...
Added Gentoo Documentation
Upstream-commit: 597479494215180cadbc62b2ffa04a6759292557
Component: engine
2013-09-04 09:58:36 -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
200311a8e1
Merge pull request #1449 from spkane/honor-ENV-VAGRANT_DEFAULT_PROVIDER
...
Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools
Upstream-commit: a0a5170991fa92f03f3a01477d69fcbb435b1ea2
Component: engine
2013-09-03 17:38:03 -07:00
32d6ba57cb
Compute dependency graph and upload layers in the right order when pushing
...
Upstream-commit: b3a70d767d913ec476bc1af53983c91a10d17f84
Component: engine
2013-09-04 02:21:40 +02:00
c7a7785d65
pr #1718 : Fetch docker gpg over https
...
Upstream-commit: 91ee67954961e9f8e5b4827022c2a3aee7997253
Component: engine
2013-09-03 17:14:49 -07:00
65eaa57cc6
Changed docker apt repo URI from https to http because the http driver for apt is not installed by default
...
Upstream-commit: 52fe45249798991a35f5a5b5a4e1af26ea42221c
Component: engine
2013-09-03 17:10:03 -07:00
e25a18de31
testing, issue #1620 : Add index functional test on docker-ci
...
Upstream-commit: 846524115bb6d1ce850f9babba59467c1054fbdd
Component: engine
2013-09-03 15:38:06 -07:00
b7cc10776d
Add a Docker example for running Riak.
...
Upstream-commit: fac4cedcc105a7b5a6789917ddf9a5e9745bd2d3
Component: engine
2013-09-03 16:30:40 -04:00
b3963e7c9f
Move auth header on run cmd
...
Upstream-commit: ded973219e997f52634eb18d0cfe828472412dd8
Component: engine
2013-09-03 20:59:48 +02:00
55601bfa49
Use base64 encoding
...
Upstream-commit: dd4aab8411ec070baeb14ecc43f683d12b722746
Component: engine
2013-09-03 20:59:48 +02:00
72419917d6
Pass auth config through headers rather than as URL param
...
Upstream-commit: d04beb7f4315c6b659958227954398437a69e5d6
Component: engine
2013-09-03 20:59:48 +02:00
d63753d770
Merge on current master
...
Upstream-commit: a2603477ddd0a7eba794dd5fd917a4d88c5241da
Component: engine
2013-09-03 20:59:48 +02:00
42b37ac06c
Send corrent endpoint authentication when an image is pulled during the run
...
cmd.
Upstream-commit: ad322d7cca4857292d41e164058382f83a06cf98
Component: engine
2013-09-03 20:59:48 +02:00
9762bbddd8
Move authConfig to a Parameter on postImagePush, too
...
Upstream-commit: da3bb9a7c6ad79f224ee91a2dd053c1e1b2ad053
Component: engine
2013-09-03 20:59:48 +02:00
a1b708cb5b
Merge pull request #1603 from dotcloud/773-docker-ci-pr
...
773 docker-ci github pull request
Upstream-commit: 0e6ee9632c9806a0c712ab140815103ebe6a66fa
Component: engine
2013-09-03 11:46:34 -07: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
0a02121daf
Update tar pkg revision number
...
Upstream-commit: ea813d8593d30e430ce05597becb1e394cb72a25
Component: engine
2013-09-03 18:30:32 +00:00
2e60ad0f9a
Merge pull request #1317 from calavera/login_signal
...
Exit from `docker login` on SIGTERM and SIGINT.
Upstream-commit: d13c2ed24edf38908400485cba82110361545ffe
Component: engine
2013-09-03 11:16:05 -07: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
