docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-12 16:32:36 +03:00
Code Activity
47,845 Commits 121 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrea Luzzardi
0c72bcaf40 discovery cleanup: heartbeat is a time.Duration. 
- Use a time.Duration instead of a uint64 for hb
- Flags can accept durations: --heartbeat 25s

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi
f33c03af93 discovery: Push watch errors to a channel 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi
5756e83fcb store/consul: Watch: Use a WaitTime so we can check stopCh. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi
2a27adaea1 discovery integration: No need to wait anymore 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi
3de0b5f567 join: Don't give up if registration fails, just retry. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi
97984881c3 discovery: New channel based API. 
- Watch() issues updates by channel rather than by callback
- Fetch() is gone
- Watch() can be stopped at any time by closing the stop channel
- Watch() is now resilient to errors and will try over and over

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:13 -07:00
Andrea Luzzardi
d1b1f520f2 Merge pull request #803 from vieux/fix_match_container 
fix container matching algorithm
 2015-05-18 13:38:01 -07:00
Victor Vieux
4b03d7fa0c handle collision 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-18 13:35:33 -07:00
Mary Anthony
e1a1e3a8da Fixes #484 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-18 13:33:29 -07:00
James Lal
f5e6f50a1e Increase default connection timeout to 30s 
Closes #13307
Signed-off-by: James Lal <jlal@mozilla.com>
 2015-05-18 13:26:33 -07:00
Jeffrey Morgan
b7be558548 Merge pull request #492 from SvenDowideit/add-docs-plus-tooling 
Import Kitematic documentation into docs.docker.com
 2015-05-18 13:14:01 -07:00
Stephen Day
316f3c5831 Merge pull request #530 from dmcgowan/fix-compose-nginx 
Remove set header in compose script
 2015-05-18 13:11:28 -07:00
Stephen Day
4d17981206 Merge pull request #529 from moxiegirl/485-issue-fix 
docs: add warning about using window's volumes with registry
 2015-05-18 13:10:44 -07:00
Alvin Richards
3f37afe0b9 Bring MongoDB examples up to date with 3.0 release 
Signed-off-by: Alvin Richards <alvin.richards@docker.com>
 2015-05-18 13:08:31 -07:00
Dave Henderson
fe4652b21d Defaulting SoftLayer hostname to machine name 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-18 16:07:59 -04:00
Michael Crosby
aac645ae04 Merge pull request #13282 from duglin/RemoveBash 
Remove use of 'bash' from our tests
 2015-05-18 13:06:21 -07:00
Mary Anthony
8d407c81ae Closes #485 
Signed-off-by: Mary Anthony <mary@docker.com>

Tweak per Stephen

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-18 12:56:17 -07:00
Derek McGowan
beab2d7fbe Remove set header in compose script 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-05-18 12:05:28 -07:00
Brian Goff
ccf02a9f77 Merge pull request #13279 from hqhq/hq_use_inspectfield 
Use inspectField to simplify code
 2015-05-18 14:53:37 -04:00
Michael Crosby
785ba790fb Merge pull request #13204 from chenhanxiao/gitignore 
gitignore: add *.rej
 2015-05-18 11:51:06 -07:00
Tianon Gravi
0c375a779a Merge pull request #13244 from hqhq/hq_update_vendor_pty 
kr/pty: vendor upstream 5cf931ef8f
 2015-05-18 11:46:43 -07:00
Jeffrey Morgan
bd462b7ee9 Merge branch 'master' into hub 2015-05-18 11:44:41 -07:00
Brian Goff
3b69ca5b97 Merge pull request #13277 from runcom/restartpolicy-methods 
RestartPolicy methods instead of strings checking
 2015-05-18 14:36:54 -04:00
Michael Crosby
70e9e4bf9f Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt 
Fix incorrect document storage-opt
 2015-05-18 11:35:01 -07:00
Doug Davis
3b1f73fbcd Remove use of 'bash' from our tests 
Not 100% sure why our Windows test don't complain about some of these,
I'm guessing it because we have bash as part of some git package, but
either way we really shouldn't require bash to run our tests unless we
really need to - which in these cases we don't

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-18 11:29:08 -07:00
Michael Crosby
fc4f3e5650 Merge pull request #13295 from aimxhaisse/13294-mflag-panic 
Fix panic when using default-initialized FlagSet
 2015-05-18 11:27:12 -07:00
Aanand Prasad
80eaf4cc9f Merge pull request #1399 from aanand/state 
Only recreate what's changed
 2015-05-18 19:25:42 +01:00
Jeffrey Morgan
a07117508d Fixing bug where container would create even if downloading container was deleted 2015-05-18 11:23:06 -07:00
Sebastiaan van Stijn
93825056d8 Merge pull request #13206 from draghuram/info_api_doc 
Bring /info API doc in line with the actual response.
 2015-05-18 20:20:57 +02:00
James Turnbull
8f8ee7d5c3 Merge pull request #12804 from ankushagarwal/configuring-docker 
Add CentOS/RHEL configuration to the config article
 2015-05-18 14:18:32 -04:00
Jeffrey Morgan
62b9081e20 Fixing random id for container environment variables 2015-05-18 11:17:34 -07:00
Michael Crosby
aca4ae8c90 Merge pull request #13280 from runcom/test-clean-from-inspect 
Clean tests from not needed inspect call
 2015-05-18 11:06:18 -07:00
Michael Crosby
cbc122e8a7 Merge pull request #13306 from ahmetalpbalkan/logopts-context 
Pass --log-opts map to logdrivers
 2015-05-18 10:58:17 -07:00
Jeffrey Morgan
0ba2efebaf Merge branch 'master' into hub 2015-05-18 10:55:58 -07:00
Raghuram Devarakonda
9c0608565c Bring /info API doc in line with the actual response. 
The fix handles versions 1.18 and 1.19.

Closes #13139.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-05-18 13:55:42 -04:00
Aanand Prasad
ef4eb66723 Implement smart recreate behind an experimental CLI flag 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-18 18:39:18 +01:00
Ahmet Alp Balkan
8b11592d69 Pass -log-opts map to logdrivers 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-18 16:50:14 +00:00
Aanand Prasad
82bc7cd5ba Remove override_options arg from recreate_container(s) 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-18 17:42:09 +01:00
Aanand Prasad
3304c68891 Only set AttachStdin/out/err for one-off containers 
If we're just streaming logs from `docker-compose up`, we don't need
to set AttachStdin/out/err, and doing so results in containers with
different configuration depending on whether `up` or `run` were invoked
with `-d` or not.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-18 17:41:04 +01:00
Aanand Prasad
1e6d912fbc Merge pull request #1356 from dnephin/use_labels_instead_of_names 
Use labels instead of names to identify containers
 2015-05-18 17:38:46 +01:00
Aanand Prasad
4ef3bbcdf2 Merge pull request #1415 from aanand/fix-run-race-condition 
Fix race condition in `docker-compose run`
 2015-05-18 16:16:31 +01:00
Brian Goff
19ae59f910 Merge pull request #13283 from Microsoft/10662-fixbaselinenewdriver 
Windows: NewDriver() re-baseline parms
 2015-05-18 10:56:06 -04:00
Daniel Nephin
62059d55e6 Add migration warning and option to migrate to labels. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-18 10:55:12 -04:00
Daniel Nephin
ed50a0a3a0 Resolves #1066, use labels to identify containers 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-18 10:47:26 -04:00
Daniel Nephin
28d2aff8b8 Fix teardown for integration tests. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-18 10:44:44 -04:00
Evan Hazlett
0c2eeadc8d Merge pull request #1186 from michaellopez/patch-1 
Fixed typo in b2d_migration
 2015-05-18 09:38:45 -04:00
Michael Lopez
d55c1d363b Fixed typo in b2d_migration 
Added missing asterisk
 2015-05-18 14:07:25 +02:00
s. rannou
e94bab8278 Fix panic when using default-initialized FlagSet 
Closes #13294

Signed-off-by: Sebastien Rannou <mxs@sbrk.org>
 2015-05-18 11:55:38 +02:00
Xian Chaobo
014947daad refresh before closing the connection 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-18 04:52:37 -04:00
Sven Dowideit
48c2ed1a05 Small tweaks and fixes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-18 07:29:17 +00:00