docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,497 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

2497 Commits

Author SHA1 Message Date
Alexandre Beslic f9e4b84a19 Merge pull request #1530 from vieux/handle_engine_unhealthy_in_proxy 
return proper error for inspect and proxy on unhealthy node
 2015-12-11 11:00:43 -08:00
Victor Vieux 0116fbf3d0 Merge pull request #1531 from ch3lo/fix-typo 
fix bracket
 2015-12-11 10:37:10 -08:00
Victor Vieux 2497df0862 prevent panic in filters when container has no name 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-11 02:11:21 -08:00
Victor Vieux f25040f3ab add RELEASE-CHECKLIST.md 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-12-10 22:46:14 -08:00
Marcelo Salazar R 3e0d4f124e fix bracket 
Signed-off-by: Marcelo Salazar R <chelosalazar@gmail.com>
 2015-12-11 02:44:19 -03:00
Victor Vieux 4b33656bb4 return proper error for inspect and proxy on unhealthy node 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-12-10 20:05:17 -08:00
Victor Vieux 744e3a3925 Merge pull request #1522 from dongluochen/bump-1.0.1 
Bump version to 1.0.1
 2015-12-09 15:51:57 -08:00
Dong Chen af8cabf71d Bump version to 1.0.1 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-09 15:39:20 -08:00
Victor Vieux 94220e5f96 Merge pull request #1519 from vieux/add_dong_maintainers 
Add Dongluo to the MAINTAINERS file
 2015-12-09 14:25:09 -08:00
Victor Vieux 284a00e811 Add Dongluo to the MAINTAINERS file 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-12-09 14:07:29 -08:00
Victor Vieux 059ab13807 Merge pull request #1518 from suryagaddipati/patch-1 
Fix busted link
 2015-12-09 12:29:59 -08:00
Victor Vieux 54c97525e3 Merge pull request #1514 from moxiegirl/carry-1510 
Carry 1510
 2015-12-09 12:29:41 -08:00
Alexandre Beslic fa19c3fd55 add docs for distributed K/V discovery with secured TLS communication 
Signed-off-by: Alexandre Beslic <abronan@docker.com>

Closes #1510 and carries
Adding abronan's commentary
Tweak recommend

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-12-09 12:08:46 -08:00
Surya Gaddipati a8d4c4b0f4 Fix busted link 
Signed-off-by: Surya Gaddpati <surya.gaddipati@gmail.com>
 2015-12-09 11:18:15 -06:00
Xian Chaobo 5b28d35d31 Merge pull request #1515 from vieux/refresh_docker_godeps 
update docker godeps
 2015-12-09 10:15:45 +08:00
Alexandre Beslic a51ebdacb9 Merge pull request #1446 from MHBauer/gh1442 
OPTIONS response when cors is enabled
 2015-12-08 14:27:29 -08:00
Morgan Bauer 4dcf5a2c05
OPTIONS response when cors is enabled 
- pulled out router setup into separate method for testing
 - unit test without cors
 - unit test for cors + OPTIONS
 - resolves #1442

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-12-08 13:09:37 -08:00
Alexandre Beslic 31791e2241 Merge pull request #1513 from vieux/compose_1.5.2 
update compose to 1.5.2
 2015-12-08 12:43:37 -08:00
Victor Vieux 4aafe4aa7b Merge pull request #1492 from aluzzardi/profiling 
Enable profiling over HTTP in debug mode
 2015-12-08 12:43:00 -08:00
Alexandre Beslic ba976ed0b9 Merge pull request #1512 from vieux/1.5.1- 
go 1.5.1->1.5.2
 2015-12-08 12:23:10 -08:00
Victor Vieux cac42dc677 update docker godeps 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-08 03:39:27 -08:00
Victor Vieux b399d7c7ed update compose to 1.5.2 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-07 22:05:58 -08:00
Victor Vieux 0bddb0096f longer retries 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-07 22:04:14 -08:00
Victor Vieux 4748bb14dd add trace 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-07 21:59:03 -08:00
Victor Vieux 9677ddd06f 1.5.1->1.5.2 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-07 21:45:34 -08:00
Victor Vieux a4a1d3bd01 Merge pull request #1466 from abronan/fix_ci_discovery_race 
Integration: Wait for nodes to be registered and discovered before testing
 2015-12-07 21:11:20 -08:00
Victor Vieux f1b7b7be59 fix tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-07 19:57:29 -08:00
Victor Vieux 67a4d559db Merge pull request #1449 from jimenez/mesos_user_abnormal_error 
Improving error output for bad swarm mesos user
 2015-12-07 13:43:34 -08:00
Victor Vieux d9265c4f21 Merge pull request #1501 from abronan/modify_default_ttl_heartbeat 
Increase default TTL and heartbeat value
 2015-12-07 13:22:25 -08:00
Morgan Bauer 19369febf4 Merge pull request #1509 from MHBauer/maintainers 
Add @mhbauer to maintainers
 2015-12-07 12:56:26 -08:00
Morgan Bauer 0e8763920e
Add @mhbauer to maintainers 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-12-07 11:14:52 -08:00
Alexandre Beslic 0b0e328b7b Merge pull request #1472 from abronan/improve_docs_duplicate_engine_ids 
Add clarification on install for VM cloning and Engine ID duplication issue
 2015-12-06 21:39:37 -08:00
Alexandre Beslic 75a3ac2c7f add clarification on install for VM cloning and Engine ID duplication problem 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-06 21:27:37 -08:00
moxiegirl 63ba877cff Merge pull request #1506 from thaJeztah/fix-readme-links 
Fix broken links in discovery README
 2015-12-06 20:49:29 -08:00
Sebastiaan van Stijn fe0a2a9427 Fix broken links in discovery README 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-07 00:43:17 +01:00
Alexandre Beslic 3048dc996d Merge pull request #1497 from vieux/emphasis_token_not_prod 
emphasize the hosted discovery service is not meant for production
 2015-12-06 01:16:22 -08:00
Alexandre Beslic 501b9609dd fix typos and add note in discovery README for token usage scenarios 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-06 01:04:30 -08:00
Alexandre Beslic f21efa4337 Increase default TTL and heartbeat value 
Increases the default ttl and heartbeat value for discovery.
Because the node will still be listed for a long period on
`docker info`, there is now a Status to know if a node is
in the healthy or unhealthy state.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-04 17:11:33 -08:00
Victor Vieux f78c8054b7 Merge pull request #1498 from vieux/default_aufs 
default back to aufs
 2015-12-04 16:10:10 -08:00
Alexandre Beslic 4581e65432 Merge pull request #1438 from dongluochen/networkId 
Route network connect/disconnect request to the right engine.
 2015-12-04 16:03:54 -08:00
Sven Dowideit b1d621c286 Merge pull request #1493 from SvenDowideit/linkchecker-fixes 
Small fixes found by linkchecker
 2015-12-05 09:31:09 +10:00
Victor Vieux 765431f70f emphasize the hosted discovery service is not meant for production 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-12-04 15:22:30 -08:00
Victor Vieux 8111304a52 Merge pull request #1496 from thaJeztah/update-maintainers 
update maintainers file for parsing
 2015-12-04 15:06:05 -08:00
Sebastiaan van Stijn 2360ffe0dd update maintainers file for parsing 
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-04 16:27:15 +01:00
Andrea Luzzardi 6aa6f76f3e Merge pull request #1463 from cpuguy83/1430_tls_closewrite 
Ensure CloseWrite is called for hijacked TLS conns
 2015-12-03 19:51:19 -08:00
Brian Goff c57c8a329e Ensure CloseWrite is called for hijacked TLS conns 
Golang's `*tls.Conn` does not support `CloseWrite`, this means that
connections using TLS will not be able to properly close on hijacked
connections.

This copies Go's tls.Dial and instead returns an internal
`tlsClientConn` type that does store the raw net.Conn and implements
`CloseWrite`.
Implementation is mostly copied from
`github.com/docker/docker/api/client/hijack.go`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-12-03 22:48:28 -05:00
Andrea Luzzardi 9386efdfb1 Merge pull request #1425 from jimmyxian/set-memory-wappiness-default-value 
set MemorySwappiness default value
 2015-12-03 19:36:06 -08:00
Xian Chaobo 63498b1a80 set MemorySwappiness default value 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-12-04 09:25:32 +08:00
Xian Chaobo 0bd250bcf0 Merge pull request #1494 from dongluochen/clientUpdate 
Godep update github.com/samalba/dockerclient
 2015-12-04 09:15:27 +08:00
Dong Chen 9df95842a9 Godep update github.com/samalba/dockerclient. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-03 10:28:48 -08:00