86c79e6a69
Merge pull request #2886 from jamtur01/fedora_community
...
Updated Fedora docs
Upstream-commit: 5dab47a475fe64d11834133d0689104b4e4c57ba
Component: engine
2013-12-04 17:12:00 -08:00
991a112d99
Merge pull request #2967 from crosbymichael/return-host-config
...
Add hostconfig to container inspect
Upstream-commit: 944c1f10eadd98a8044cd869e81badd897f96f1f
Component: engine
2013-12-04 16:50:42 -08:00
fab26e18da
Merge pull request #3032 from tianon/makefile-tweaks
...
Tweak Makefile for consistency and Ctrl+C-ability
Upstream-commit: 3a8222dfa54b22ab25128140cbd6a3f3659399a7
Component: engine
2013-12-04 16:04:47 -08:00
610b53a9fe
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
...
Upstream-commit: 00030ced4bf2d0242883fae0b4ece61149f1d437
Component: engine
2013-12-04 16:56:01 -07:00
1fbf17a644
Merge pull request #3033 from proppy/add-compute-docs
...
Add Google Cloud Platform installation docs
Upstream-commit: f95621fd054004e8cc438c1bb443c3df6823d45e
Component: engine
2013-12-04 15:05:07 -08:00
2f933c3fb1
Merge pull request #3020 from crosbymichael/remove-init-layer
...
Ensure that the init layer is removed with the container
Upstream-commit: 4328926acc4cbaa96f0bba44b652e40a559bb0bd
Component: engine
2013-12-04 14:46:48 -08:00
938c440dbd
docs/installation: add google compute engine quickstart
...
Upstream-commit: 3df5d120de4f42cc208283bf78b26ca5b21c6776
Component: engine
2013-12-04 12:25:22 -08:00
dbb1b9b6d5
fix jsonmessage
...
Upstream-commit: 4bc100b494022901d4d7f51cba303ae3562b1303
Component: engine
2013-12-04 11:57:18 -08:00
0624a140ec
fix offline image transfert
...
Upstream-commit: be282b57d561bdb7e686ed8d4f7b6327e7a65b70
Component: engine
2013-12-04 11:55:42 -08:00
8eac8d89db
remove unused parameter in Download
...
Upstream-commit: 12180948be8040a4cdf99a0e660098cd33e32832
Component: engine
2013-12-04 11:54:11 -08:00
f9faf9ad5d
Merge pull request #2796 from EmilHernvall/master
...
Support for same port on multiple interfaces
Upstream-commit: 6cf2c14c0065e0adb95c505fdc09c00826f4011a
Component: engine
2013-12-04 11:15:51 -08:00
f2f4f227e1
Merge pull request #2790 from proppy/fix-tar
...
utils: remove dotcloud/tar dep
Upstream-commit: dc9f8bf072dfb65f32c6dc569d133361030daa0a
Component: engine
2013-12-04 11:06:13 -08:00
6e7481e8ee
Merge pull request #3018 from pnasrat/3017-debug-expvar
...
Expose expvar endpoint during debugging.
Upstream-commit: 0862756beb103c7a40b935f7e0a7dfd79de0c754
Component: engine
2013-12-04 10:53:35 -08:00
dce2c8c9b7
Merge pull request #2946 from dhrp/doc-postgres-typo
...
Fixed some grammar and one other line in postgres example
Upstream-commit: de60bee3d4f34cdc61120463851fb996c4d8eb4c
Component: engine
2013-12-04 10:51:02 -08:00
55c7790d1c
Merge pull request #3000 from creack/improve_make_sh_test
...
Improve make sh test
Upstream-commit: 51b9fe73012e84d27dbf1361df61162d6bf6761c
Component: engine
2013-12-04 10:41:55 -08:00
06ae34a0b2
Merge pull request #3029 from pnasrat/container-refactoring
...
Container refactoring
Upstream-commit: 61aad8fc105ee58d585fc403647146acc3e10f09
Component: engine
2013-12-04 10:35:42 -08:00
e21c443f19
Extract volume bind, creation and external methods.
...
Make Start() slightly more readable.
Upstream-commit: 40fe9f581bd56bbcab9f231763cfac20e659d8c3
Component: engine
2013-12-03 18:58:31 -05:00
0171e1cc75
Merge pull request #2339 from shin-/private_reg_auth
...
Private registry auth
Upstream-commit: 258d707548619eae7517b39ff0bc9541ebec566c
Component: engine
2013-12-03 15:29:38 -08:00
7da5754161
Merge pull request #2930 from creack/docker-osx
...
Docker client on OSX
Upstream-commit: 99e4f5635368b25a505edc114d66061def7163fc
Component: engine
2013-12-03 15:27:21 -08:00
0c7bc6f2ce
Extract helper method for volume linking.
...
Makes this more readable.
Upstream-commit: 84f78d9cad4162ddfc1bccbe55402050123cb1c5
Component: engine
2013-12-03 17:35:54 -05:00
9d4980d1a7
Merge pull request #2999 from dotcloud/improve_progress_bars
...
Handle small screens
Upstream-commit: f8176de191aa4dff9277ae8a2a08d738932fca73
Component: engine
2013-12-03 14:24:40 -08:00
71ac3b3d2a
Handle small screens
...
Upstream-commit: f50fe14e13160c7c823613710a6fa12c9fc13bcb
Component: engine
2013-12-03 14:21:33 -08:00
8fd397a50c
Updated Fedora docs
...
* Added Fedora installation instructions
Upstream-commit: 45567f2209d3450142ae8042f674269902d58e3b
Component: engine
2013-12-03 16:55:55 -05:00
b151598031
Merge pull request #3009 from silas/stream-logs
...
Add stream flag to logs command
Upstream-commit: 2fd76fc0b826524cd6d133fb8163cf6066b8ce03
Component: engine
2013-12-03 13:43:35 -08:00
d385113417
Rename logs -stream to logs -f
...
Upstream-commit: b699aee91f90b8390dfa6e8ef58e983fc8c4f3e5
Component: engine
2013-12-03 20:35:22 +00:00
aea480f046
Add docs for hostconfig in inspect
...
Upstream-commit: 664174c7aa1300b9a856eafafc01a1d416a731ff
Component: engine
2013-12-03 11:09:10 -08:00
05ddc4a077
Support TESTFLAGS
...
Upstream-commit: d21563ced3a24ebfc8a9b53e5ec687543f7b2979
Component: engine
2013-12-03 14:49:10 -05:00
dadb586d63
Expose expvar endpoint during debugging.
...
Fixes #3017
Upstream-commit: 6a55169e2e0d039f7404b236b321fa7c76b99618
Component: engine
2013-12-03 13:04:18 -05:00
7e8e4fe649
Ensure that the init layer is removed with the container
...
Upstream-commit: 5976c26c1e7bc7b29489250b8100412ea3d27b60
Component: engine
2013-12-03 09:44:48 -08:00
27db2d038b
Handle 401 response in auth.Login() for authed private registries
...
Upstream-commit: 9be5db8704be5bda02484c374f4bd9b197d5701b
Component: engine
2013-12-03 16:32:13 +01:00
3959a8a4bc
Don't return req as result of setTokenAuth
...
Upstream-commit: 3f921639894d3eca72c9ae105d3ad4f386651caa
Component: engine
2013-12-03 16:32:13 +01:00
14f5d29204
missed one call to setTokenAuth
...
Upstream-commit: 3b5010e90bd51ba3630f48091ed70111d26dd31a
Component: engine
2013-12-03 16:32:13 +01:00
c52437abda
Factorized auth token setting
...
Upstream-commit: ec4863ae5582d8e7a9dccb57d7f5f3e21c2481ef
Component: engine
2013-12-03 16:32:13 +01:00
99feeadcbb
gofmt
...
Upstream-commit: a02bc8a5dbca763a2a245cf0ca17ff5a21d5b52b
Component: engine
2013-12-03 16:32:13 +01:00
37888fa7b4
Use basic auth for private registries when over HTTPS.
...
RequestFactory is no longer a singleton (can be different for different instances of Registry)
Registry now has an indexEndpoint member
Registry methods that needed the indexEndpoint parameter no longer do so
Registry methods will only use token auth where applicable if basic auth is not enabled.
Upstream-commit: 045989e3d824f577cd90a6386b66a5814e703766
Component: engine
2013-12-03 16:32:13 +01:00
13eb2fe87b
Added HTTPAuthDecorator
...
Upstream-commit: bbf9135adcaec9edc2e9d0ebce6a78ba3ade3689
Component: engine
2013-12-03 16:24:47 +01:00
5cd0105c86
Support for same port on multiple interfaces
...
This commit improves upon the PortMapper and PortAllocator classes by changing
their internal data structures for port allocations to use a string rather than
a single integer. This string holds the network interface address as well as the
port number. This solves a previous problem where a port would be incorrectly
reported as being in use because it had been allocated for a different interface.
I've also added a basic test case for the PortMapper class, and extended the
existing test case for PortAllocator. In the case of PortMapper, this is done
by handing it a stub function for creating proxies rather than an actual
implementation.
Upstream-commit: 1cb1e08644b450d3371bfd7d6e305be454d19719
Component: engine
2013-12-03 15:14:54 +01:00
edb20bb130
Only stream logs when container is running
...
Upstream-commit: 3ddbb36a84d5530b1f6b496ff8d79ade6f539267
Component: engine
2013-12-03 07:17:07 +00:00
1b165a51bf
Add stream flag to logs command
...
Upstream-commit: 62263967b91ca841c43b980aec0ebc74ab2d838d
Component: engine
2013-12-03 06:18:01 +00:00
ae3478d13e
Merge pull request #2821 from jpellerin/2820-fix-daemon-dns
...
Fixes #2820
Upstream-commit: 3ed0ff85f52b211746ffa10d968e43b9e3f93416
Component: engine
2013-12-02 18:19:31 -08:00
f8ae708f7f
Add hostconfig to container inspect
...
Upstream-commit: c4c90e9cec1b3f3cc5aa652e4e9155f6a2e687aa
Component: engine
2013-12-02 18:06:04 -08:00
2d52207a24
Merge pull request #3005 from gurjeet/zfs_driver_owner
...
Typo fix
Upstream-commit: 650d4cc64438bd6b1ae12f77aa98a663eec1b4bc
Component: engine
2013-12-02 15:06:05 -08:00
ff0ebd8660
Typo fix
...
Upstream-commit: d9b742419c48bfe57b16d7bf18915a9b31f3548d
Component: engine
2013-12-02 18:03:54 -05:00
247a658901
Add some color in order to emphasis the test FAILURE
...
Upstream-commit: 829b118dd8fbfb9ce1585c15699cf6221c328802
Component: engine
2013-12-02 14:54:01 -08:00
eb27ea66a2
Add unit test for ValidateIp4Address
...
Upstream-commit: 5a9cf7e75442ce1c76876da717b8c2f321fc04ae
Component: engine
2013-12-02 17:33:33 -05:00
ac96c6da33
Remove trailing whitespace
...
Upstream-commit: 0017c68f4a56f9250b53e4f8efdf3513b051c1a3
Component: engine
2013-12-02 13:52:27 -08:00
e3b038914a
Fixes #2820
...
Upstream-commit: 3cd9b2aadfd16736032ee569ba263fce53286347
Component: engine
2013-12-02 16:22:39 -05:00
349763ab43
Merge pull request #2998 from creack/fix_json_display
...
Fix json display
Upstream-commit: 8afb0abbee0ff135a5314d7078285378b8f49c93
Component: engine
2013-12-02 12:58:58 -08:00
eade1687a5
Fix unit test with new buildfile prototype
...
Upstream-commit: 98ed1dc433e423b93ae0619c5a2c474ccec1454d
Component: engine
2013-12-02 12:51:37 -08:00
0e8aae3193
Merge pull request #2959 from crosbymichael/fix-auth-split
...
Split auth on first colon
Upstream-commit: 7aec93c37094fa09631b13061553950088e9e6fa
Component: engine
2013-12-02 12:21:04 -08:00
