1
0
mirror of https://github.com/docker/docs.git synced 2026-11-12 16:32:36 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Alexandre Beslic
4408a9cc8c Add Ephemeral for Consul, Zookeeper and Etcd (Etcd abd Consul are using TTLs in the background)
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 10:25:31 -07:00
Alexandre Beslic
d5915b2a09 Merge pull request #811 from aluzzardi/node-removal
Handle Node Removal from Discovery correctly
2015-05-19 10:11:10 -07:00
Arnaud Porterie
a16b2ab274 Merge pull request #13265 from tiborvass/refactor-v1-auth
registry: Refactor requestfactory to use http.RoundTrippers
2015-05-19 09:57:34 -07:00
Tianon Gravi
c64466fb68 Fix "squeeze" detection in contrib/mkimage/debootstrap
This stops us from erroneously adding "squeeze-lts" to "oldstable" which is now "wheezy", not "squeeze" (but "oldoldstable" _is_ squeeze, hence the new check on `/etc/debian_version` being `6.*` instead, and done as a `case` for the eventual addition of `wheezy-lts`, etc).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-19 09:38:27 -07:00
Alexander Morozov
ea4f43c2fa Merge pull request #13258 from unclejack/fix_build_network
builder/internals: set up network as bridge
2015-05-19 09:36:03 -07:00
Alexander Morozov
3916561619 Fix Put without Get in overlay
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-05-19 09:32:23 -07:00
moxiegirl
6f4b808f41 Merge pull request #13238 from hqhq/hq_fix_usingdocker_md
Remove wrong usage in usingdocker.md
2015-05-19 09:24:31 -07:00
Alexander Morozov
29595fd944 Merge pull request #13311 from WeiZhang555/cleanup
clean some redundant else clauses
2015-05-19 07:57:52 -07:00
Harald Albers
41315b32cb Fix #1426 - migrate_to_labels not found
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-19 16:37:50 +02:00
Evan Hazlett
76ba5b258e vbox: use intel driver for nic
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-19 09:26:24 -04:00
Evan Hazlett
c4be46ad03 Merge pull request #1183 from hairyhenderson/softlayer-use-machinename-as-hostname-1003
Defaulting SoftLayer hostname to machine name
2015-05-19 09:23:16 -04:00
Xian Chaobo
064e91cd23 fix image match and fix docker save
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 05:21:14 -04:00
Xian Chaobo
24eb0adbb0 fix #810 bool value
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 04:01:41 -04:00
Qiang Huang
f46cf73295 Remove wrong usage in usingdocker.md
Fixes: https://github.com/docker/docker/issues/13235

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-19 13:07:41 +08:00
Jeffrey Morgan
00b29799e3 Merge pull request #516 from SvenDowideit/docs-fixups
replace PID-0 with main container process, and tweak a little
2015-05-18 20:37:59 -07:00
Tibor Vass
73823e5e56 Add transport package to support CancelRequest
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-05-18 23:31:42 -04:00
Zhang Wei
d91ae65280 clean some redundant else clauses
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-05-19 10:54:04 +08:00
Victor Vieux
7b3c889407 Merge pull request #809 from jimmyxian/bugfix-volumes-from
fix #807: support --volumes-from rw/ro
2015-05-18 19:41:36 -07:00
Sven Dowideit
933f2b5a76 replace PID-0 with main container process, and tweak a little
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-05-19 02:31:26 +00:00
Mingzhen Feng
3ab7ceb5d7 Removal of the regex to replace ips
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn>
2015-05-19 10:15:18 +08:00
Andrea Luzzardi
3c4b19ed26 Merge pull request #812 from docker/flag_to_env
adding environment variable option when treating flags
2015-05-18 19:08:53 -07:00
Jason Shepherd
48231d623f adding nicer help when missing arguments (#11858)
Signed-off-by: Jason Shepherd <jason@jasonshepherd.net>
2015-05-19 12:02:13 +10:00
Tibor Vass
cf8c0d0f56 requestdecorator: repurpose the package and rename to useragent
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-05-18 21:51:54 -04:00
Tibor Vass
a01cc3ca77 registry: Refactor requestfactory to use http.RoundTrippers
This patch removes the need for requestFactories and decorators
by implementing http.RoundTripper transports instead.

It refactors some challenging-to-read code.

NewSession now takes an *http.Client that can already have a
custom Transport, it will add its own auth transport by wrapping
it.

The idea is that callers of http.Client should not bother
setting custom headers for every handler but instead it should
be transparent to the callers of a same context.

This patch is needed for future refactorings of registry,
namely refactoring of the v1 client code.

Signed-off-by: Tibor Vass <tibor@docker.com>
2015-05-18 21:51:53 -04:00
Doug Davis
472538bee0 Merge pull request #13219 from brahmaroutu/gccgo_compile_issue
fix to gccgo compilation error
2015-05-18 20:43:47 -04:00
Isabel Jimenez
8001455ecf adding ip as an option for flags
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
2015-05-18 20:34:57 -04:00
Isabel Jimenez
19d51f4a1a adding environment variable option when treating flags
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
2015-05-18 20:16:21 -04:00
Stephen Day
cde7b93b85 Merge pull request #531 from moxiegirl/484-version-fix
docs: clarify minimum docker version for use with v2 API
2015-05-18 16:49:29 -07:00
moxiegirl
6a18412d5b Merge pull request #13189 from alvinr/mongodb-fixup
Fixup MongoDB changes to line up with MongoDB 3.0 release
2015-05-18 15:22:41 -07:00
Doug Davis
dfc329d76a Merge pull request #13308 from lightsofapollo/issue-13307
Increase default connection timeout to 30s
2015-05-18 18:01:00 -04:00
Andrea Luzzardi
55c52f7a92 Merge pull request #799 from vieux/update_usage
update usage to look more like the engine/machine
2015-05-18 14:16:20 -07:00
Peter Edge
ae33cf1448 fix build for mac with golang 1.4 after doing godep go install ./...
Signed-off-by: Peter Edge <peter.edge@gmail.com>
2015-05-18 23:07:30 +02:00
Victor Vieux
a43f10adc4 update usage to look more like the engine/machine
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-18 13:57:43 -07:00
Andrea Luzzardi
dd48440d98 api: "Host Down" instead of "Pending" as a status
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00
Andrea Luzzardi
8c9449899b api: Log requests to debug level
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00
Andrea Luzzardi
7dec704b8a integration: node removal for file discovery
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00
Andrea Luzzardi
d7b8734e97 cluster: Handle node removal
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00
Andrea Luzzardi
7c0dba5de6 engine: Support for disconnection
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00
Andrea Luzzardi
08dc3c7c7b discovery: Add the Entries.Diff helper.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:54:51 -07:00
Victor Vieux
2fd48d8ac4 Merge pull request #805 from aluzzardi/discovery-watch
Revamped Discovery: Channel based and resilient to errors
2015-05-18 13:53:13 -07:00
Andrea Luzzardi
6fbbfd7287 integration: give zk some extra time.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:45:11 -07:00
Andrea Luzzardi
3d6f833f6f fix --heartbeat flag.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:15 -07:00
Andrea Luzzardi
0c9e8c8803 discovery: Added kv tests using the mock Store.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:15 -07:00
Andrea Luzzardi
2106966d54 discovery: Watch tests for file and some other tests.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi
f49ca7e20f store: Mock stores can now be created
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi
b459f7c7f8 store: Add Mock store.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi
9399a8835c golint fixes.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi
ac18ef381d integration: cover more grounds in discovery testing.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi
9179ed3d34 integration: move discovery into its own folder
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi
7430fe5141 fix hb/timeout being time.Duration in a few places
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00