shin-
14f5d29204
missed one call to setTokenAuth
...
Upstream-commit: 3b5010e90bd51ba3630f48091ed70111d26dd31a
Component: engine
2013-12-03 16:32:13 +01:00
shin-
c52437abda
Factorized auth token setting
...
Upstream-commit: ec4863ae5582d8e7a9dccb57d7f5f3e21c2481ef
Component: engine
2013-12-03 16:32:13 +01:00
shin-
99feeadcbb
gofmt
...
Upstream-commit: a02bc8a5dbca763a2a245cf0ca17ff5a21d5b52b
Component: engine
2013-12-03 16:32:13 +01:00
shin-
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
shin-
13eb2fe87b
Added HTTPAuthDecorator
...
Upstream-commit: bbf9135adcaec9edc2e9d0ebce6a78ba3ade3689
Component: engine
2013-12-03 16:24:47 +01:00
Emil Hernvall
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
Marek Goldmann
9b091fc10b
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS.
...
Upstream-commit: 682cf48d1db0851789b593db732ed3801e765d56
Component: engine
2013-12-03 11:25:53 +01:00
Sven Dowideit
7fde61bd0c
add an example of docker ps, and also of link aliases
...
Upstream-commit: 48e1766527770da5ca4e7554f671705d721a5a04
Component: engine
2013-12-03 17:57:51 +10:00
Silas Sewell
edb20bb130
Only stream logs when container is running
...
Upstream-commit: 3ddbb36a84d5530b1f6b496ff8d79ade6f539267
Component: engine
2013-12-03 07:17:07 +00:00
Silas Sewell
1b165a51bf
Add stream flag to logs command
...
Upstream-commit: 62263967b91ca841c43b980aec0ebc74ab2d838d
Component: engine
2013-12-03 06:18:01 +00:00
Michael Crosby
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
Michael Crosby
f8ae708f7f
Add hostconfig to container inspect
...
Upstream-commit: c4c90e9cec1b3f3cc5aa652e4e9155f6a2e687aa
Component: engine
2013-12-02 18:06:04 -08:00
Tianon Gravi
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
Gurjeet Singh
ff0ebd8660
Typo fix
...
Upstream-commit: d9b742419c48bfe57b16d7bf18915a9b31f3548d
Component: engine
2013-12-02 18:03:54 -05:00
Tianon Gravi
abbb76e290
Add cgroup-bin dependency to our Ubuntu package
...
Since cgroup-bin is only "recommended" by the lxc package on Ubuntu, but is necessary for having the proper cgroups mounted for Docker to function, this makes some sense for us to add separately.
Fixes #2990
Upstream-commit: c81bb20f5b2b5d86059c6004e60ba23b03d30fe0
Component: engine
2013-12-02 16:02:54 -07:00
John Feminella
1ba0ef805d
Fixes broken RST links; clarifies AWS instructions
...
Upstream-commit: 6c70d23e0d850b31fce0e658ad9ddd7a167bcdcb
Component: engine
2013-12-02 17:55:42 -05:00
John Feminella
22aa07cf7a
Reformats source text to proper widths
...
Upstream-commit: c9432cf51aea9351cc88791036b986e6662a49b8
Component: engine
2013-12-02 17:55:42 -05:00
Guillaume J. Charmes
247a658901
Add some color in order to emphasis the test FAILURE
...
Upstream-commit: 829b118dd8fbfb9ce1585c15699cf6221c328802
Component: engine
2013-12-02 14:54:01 -08:00
Tianon Gravi
d18e13a2e4
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
...
Upstream-commit: 3ac76cfeffafcfdc3688fda58cb29d9bb7f6149b
Component: engine
2013-12-02 15:48:39 -07:00
JP
eb27ea66a2
Add unit test for ValidateIp4Address
...
Upstream-commit: 5a9cf7e75442ce1c76876da717b8c2f321fc04ae
Component: engine
2013-12-02 17:33:33 -05:00
Josh Poimboeuf
3236823285
add env variable to disable kernel version warning
...
Allow the user to set DOCKER_NOWARN_KERNEL_VERSION=1 to disable the
warning for RHEL 6.5 and other distributions that don't exhibit the
panics described in https://github.com/dotcloud/docker/issues/407 .
Upstream-commit: e4aba11e80561d06e457453c58def970518b691c
Component: engine
2013-12-02 15:56:51 -06:00
Tianon Gravi
e1e3b66771
Remove mkimage-centos.sh in favor of a new rinse-based script, since febootstrap is fragile and picky
...
Upstream-commit: 9d62dc1a0837e37ce5da01c278ab20f7d32c3774
Component: engine
2013-12-02 14:54:04 -07:00
Guillaume J. Charmes
ac96c6da33
Remove trailing whitespace
...
Upstream-commit: 0017c68f4a56f9250b53e4f8efdf3513b051c1a3
Component: engine
2013-12-02 13:52:27 -08:00
JP
e3b038914a
Fixes #2820
...
Upstream-commit: 3cd9b2aadfd16736032ee569ba263fce53286347
Component: engine
2013-12-02 16:22:39 -05:00
Victor Vieux
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
Guillaume J. Charmes
eade1687a5
Fix unit test with new buildfile prototype
...
Upstream-commit: 98ed1dc433e423b93ae0619c5a2c474ccec1454d
Component: engine
2013-12-02 12:51:37 -08:00
Victor Vieux
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
Victor Vieux
1528c85fe3
Merge pull request #2965 from crosbymichael/no-private-port
...
Only return published ports for docker port
Upstream-commit: 62f0e5aef9726761cde5bc73abdf7c318102203e
Component: engine
2013-12-02 12:18:47 -08:00
Victor Vieux
5f09ff39ce
Merge pull request #2982 from tianon/dockerfile-best-practice
...
Update Dockerfile with all-caps INSTRUCTIONS
Upstream-commit: 59a85798fade8cbe39cac1c66ea210ec16132b61
Component: engine
2013-12-02 12:14:04 -08:00
Victor Vieux
f20cc21995
Merge pull request #2957 from creack/handle_sigquit
...
Catch SIGQUIT for cleanup
Upstream-commit: 67c03552f65e912550295e1dfc9498055ddd3ac9
Component: engine
2013-12-02 12:13:07 -08:00
Victor Vieux
4e6bccd97f
Merge pull request #2921 from dustin/inspect-format
...
Add -format to 'docker inspect'
Upstream-commit: 4fdc117ad2d5f9b212ac567db1e0e514016880d7
Component: engine
2013-12-02 12:08:15 -08:00
Guillaume J. Charmes
16982ec76d
small reformatting jsonmessage
...
Upstream-commit: 5cd09dc1158c62754641dce9c59a735c41e59722
Component: engine
2013-12-02 11:49:11 -08:00
Guillaume J. Charmes
134dbf8c6a
Fix displayJson behavior (dont add newline)
...
Upstream-commit: 6ea3b9651b3793e31a320926472ff23383a7b915
Component: engine
2013-12-02 11:47:13 -08:00
Guillaume J. Charmes
3412149ffe
Do not format at each write but use a Writer instead (build)
...
Upstream-commit: de4429f70d51056c3ec32072f3f18898e36171b3
Component: engine
2013-12-02 11:43:41 -08:00
Michael Crosby
4ad49ae63e
Merge pull request #2924 from tianon/strict-fhs-compatibility
...
Add proper dockerinit path support for distros that use FHS 2.3
Upstream-commit: 8cc524996a0d29a5b11a14ef17950193d45c1e05
Component: engine
2013-12-02 11:35:36 -08:00
Tianon Gravi
0d9d61008f
Merge pull request #2995 from gurjeet/zfs_driver_owner
...
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
Upstream-commit: d9fbdd7b3f8e1507ed6f08ed99fab4d983108719
Component: engine
2013-12-02 11:10:16 -08:00
Dustin Sallings
56e5aafa16
CLI docs and examples of format
...
Upstream-commit: 4ad3dfb05f1932793cae5c8047a89660747b95b4
Component: engine
2013-12-02 11:07:41 -08:00
Dustin Sallings
b0a3ce1eef
Use inspect format to get IP address for psql example
...
Upstream-commit: 1d503be4660667a27b42f7bf0c089404cabd2c9c
Component: engine
2013-12-02 11:07:41 -08:00
Dustin Sallings
c86bbee38a
Add -format to 'docker inspect'
...
This makes it a lot easier to script with docker instances as one can
ask for details about running instances more easily without having to
have additional JSON processing tools installed.
dotcloud/docker#734
Upstream-commit: 9837ad8e9b96b118e8d004e773a05ff9dd208b48
Component: engine
2013-12-02 11:07:41 -08:00
Gurjeet Singh
8b06459645
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
...
Upstream-commit: 70b586702cb1715d4ff4dd7ffe356285df73b18e
Component: engine
2013-12-02 14:03:16 -05:00
Victor Vieux
128e1b30b4
Merge pull request #2728 from SvenDowideit/docker-import-doc
...
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
Upstream-commit: 4b35c1b6a6167a0dce11cd748c94598199dce942
Component: engine
2013-12-02 10:59:15 -08:00
Michael Crosby
26b3fb6752
Merge pull request #2829 from dotcloud/refactor_opts
...
Refactor opts
Upstream-commit: fe571dd29328efe5f5318c0b146d0aa5a66217a2
Component: engine
2013-12-02 10:41:30 -08:00
Michael Crosby
92e4ac1dc3
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
Upstream-commit: e1414a4c3999362c97ad66ed1dd9cd64678df9af
Component: engine
2013-12-02 10:31:09 -08:00
Victor Vieux
3b9e303902
Merge pull request #2994 from discordianfish/1150-build-return-exit-code
...
Bump api version and update docs
Upstream-commit: d4ebba703c5d1f59f40469bd8afaecb514f1613c
Component: engine
2013-12-02 10:30:46 -08:00
Johannes 'fish' Ziemke
fe4ba516d1
Bump api version and update docs
...
Upstream-commit: e4cb83c50e554bfd8ae3e0a1f2be4f0fb661861d
Component: engine
2013-12-02 19:27:28 +01:00
Michael Crosby
63272cdce4
Merge pull request #2981 from tianon/less-verbose-testing
...
Remove "-v" from "go test" (since it's easy to add back manually via TESTFLAGS)
Upstream-commit: d7dd19d22e92c19aec63fd1bd69b30109ed2a727
Component: engine
2013-12-02 10:14:25 -08:00
Guillaume J. Charmes
f91ba66458
Merge pull request #2984 from SvenDowideit/2319-build-check-for-dockerfile
...
check on the client side that there is a Dockerfile
Upstream-commit: 5f2313aad396a7cf5750fd5c13236bc5b81b8026
Component: engine
2013-12-02 09:35:31 -08:00
Guillaume J. Charmes
8118fea381
Merge pull request #2775 from daniel-garcia/2671-bindmount_files
...
fixes #2671 , add support for bind mounting individual files in to contai...
Upstream-commit: d6cdbca6c118a1022f6cb4cd5e260a01aa342009
Component: engine
2013-12-02 09:30:08 -08:00
Guillaume J. Charmes
2e76dd6caa
Merge pull request #2206 from discordianfish/1150-build-return-exit-code
...
Make docker build return exit code of build step
Upstream-commit: 751250015bbecd9d8c4158b7a8398b3dc2eccde4
Component: engine
2013-12-02 09:01:11 -08:00
Johannes 'fish' Ziemke
85e4b81e0c
Make docker build return exit code of build step
...
If a command during build fails, `docker build` now returns with
the exit code of that command.
This makes it necessary to change the build api endpoint to
return a json object stream.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
2013-12-02 17:52:37 +01:00
