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

3197 Commits

Author SHA1 Message Date
Dongluo Chen 27968edd8a Merge pull request #2454 from dongluochen/bump-v1.2.5 
Bump version to 1.2.5
 2016-08-18 16:05:59 -07:00
Dong Chen 04114bb5b5 Bump version to 1.2.5 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-08-18 16:03:39 -07:00
Dongluo Chen dcaaa5570a Merge pull request #2436 from dongluochen/rescheduleWithOverlay 
Reschedule containers with global network
 2016-08-18 14:41:03 -07:00
Charles Smith 25919db69e Merge pull request #2453 from RangerMauve/patch-3 
Fix name of private key in configure-tls guide
 2016-08-18 14:09:32 -07:00
RangerMauve c5d5e7341b Fix name of private key in configure-tls guide 
Fixes https://github.com/docker/docker/issues/25823

Signed-off-by: Georgiy Shibaev <RangerMauve@hotmail.com>
 2016-08-18 10:04:51 -04:00
Dongluo Chen 93fec7608c Merge pull request #2442 from dongluochen/install-w-machine 
Revert install-w-machine.md to 833471b74c.
 2016-08-17 20:37:13 -07:00
Nishant Totla 5e2ae22513 Merge pull request #2444 from dongluochen/containerRefresh 
Listen to health_status events
 2016-08-17 16:20:43 -07:00
Dong Chen c3b9a533bc Reschedule with overlay network 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-08-17 11:41:08 -07:00
Dong Chen 5243531291 Fix link to discovery.md. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-08-17 10:02:49 -07:00
Dong Chen 0a0ebb16fe Add test output to debug failure. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-08-15 00:47:42 -07:00
Allen Sun 26811e6a09 Merge pull request #2407 from xianlubird/bug/schedule-log 
Fix scheduler detail log improper effect when container name is empty
 2016-08-06 11:05:21 +08:00
Dong Chen c9d614ffe1 Listen to health_status events. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-08-05 13:48:25 -07:00
Dong Chen 1c0b72c4db Revert install-w-machine.md to 833471b74c. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-08-03 17:40:32 -07:00
Sven Dowideit 9eae185fdd Merge pull request #2337 from dangoncalves/issue-2336 
Make install manual less confusing
 2016-08-03 11:38:04 -07:00
Daniel Gonçalves 535ea05d3d Make install manual less confusing 
Signed-off-by: Daniel Gonçalves <daniel.goncalves@polymont.fr>
 2016-08-03 15:43:16 +02:00
xianlubird 2164f0283d Fix scheduler detail log improper effect when container name is empty 
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
 2016-08-02 11:06:49 +08:00
Allen Sun a5a7ed4526 Merge pull request #2244 from ezrasilvera/mesosCheckNameFix 
Check unique container name on create and rename for Mesos cluster
 2016-08-02 10:17:12 +08:00
Alexandre Beslic 5d5f7f04c8 Merge pull request #2435 from nishanttotla/bump-1.2.4 
Bump version to 1.2.4
 2016-07-28 12:47:36 -07:00
Nishant Totla 3d4d8be89b
Bump version to 1.2.4 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-07-28 12:20:46 -07:00
Nishant Totla 0d05ee2354 Merge pull request #2206 from nishanttotla/http-client-create 
Creating http client in swarm
 2016-07-28 01:14:19 -07:00
Dongluo Chen 8d2748ff6b Merge pull request #2429 from nishanttotla/add-case-docker-112 
Adding case for updating client version, for Docker 1.12
 2016-07-23 15:53:26 -07:00
Nishant Totla b88763773b
Adding case for updating client version, for Docker 1.12 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-07-22 16:34:20 -07:00
Nishant Totla 0f188a3787
Creating http client in swarm 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-07-22 16:29:20 -07:00
Dongluo Chen 2fdb517952 Merge pull request #2251 from doronp/Fix-#2247 
Ignoring gone Engine removing the network from the rest
 2016-07-21 21:01:46 -07:00
Doron Podoleanu bd74d1dc46 Ignoring gone Engine removing the network from the rest 
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>

Use exported var

Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>

Verify global scope before iteration on all engines

Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
 2016-07-21 16:07:42 +03:00
Nishant Totla 9d8b938222 Merge pull request #2427 from abronan/update_libkv 
libkv: update godeps, fix wrong error check on zookeeper List
 2016-07-20 19:00:39 -07:00
Alexandre Beslic 318666579a libkv: fix wrong error check on zookeeper List 
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
 2016-07-20 16:40:29 -07:00
Nishant Totla 76b6754cc6 Merge pull request #2426 from nishanttotla/bump-v1.2.4-rc2 
Bump version to v1.2.4-rc2
 2016-07-20 13:09:26 -07:00
Nishant Totla 5356356ae4
Bump version to v1.2.4-rc2 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-07-20 12:39:50 -07:00
Alexandre Beslic b71933665c Merge pull request #2418 from dongluochen/cli_healthcheck 
Add healthcheck info to CLI
 2016-07-19 23:07:23 -07:00
Dongluo Chen 562da10f2d Merge pull request #2424 from dongluochen/reschedulingtest 
Fix rescheduling test
 2016-07-19 21:25:54 -07:00
Dong Chen d283e00512 Fix rescheduling test. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-07-19 19:05:07 -07:00
Dong Chen 3982f039a2 Add healthcheck info to CLI. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-07-19 18:33:43 -07:00
Dongluo Chen ef0aa2aeb2 Merge pull request #2423 from nishanttotla/engine-api-update-interface 
Updating engine-api to latest, with a new client interface
 2016-07-19 18:31:07 -07:00
Nishant Totla 62b0b29aa6
Adding new client interface in Swarm 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-07-19 16:56:09 -07:00
Alexandre Beslic 584c6bee65 Merge pull request #2400 from xianlubird/bug/refresh-network 
Remove refresh network when creating container
 2016-07-19 13:24:18 -07:00
Nishant Totla 936f2f7914
Updating engine-api to latest 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-07-18 11:59:49 -07:00
Sebastiaan van Stijn 384d95a1d0 Merge pull request #2413 from avsm/typo-in-label-docs 
docs: fix extra newline in swarm label addition
 2016-07-14 16:03:56 +02:00
Anil Madhavapeddy 9b80918528 docs: fix extra newline in swarm label addition 
Signed-off-by: Anil Madhavapeddy <anil@docker.com>
 2016-07-14 14:36:32 +01:00
Dongluo Chen 6aa4e3cdc5 Merge pull request #2254 from allencloud/get-volume-labels-when-refreshVolumes 
Refresh single volume when volume event emitted
 2016-07-13 17:57:47 -07:00
allencloud c8e39ae954 refresh single volume when event emitted 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-13 12:05:07 +08:00
Dongluo Chen 165868e33a Merge pull request #2331 from allencloud/update-min-engine-version-swarm-supports 
update min docker engine's version swarm supports
 2016-07-12 17:37:51 -07:00
Victor Vieux 444e25d50e Merge pull request #2412 from ezrasilvera/FixMesosRlock 
Fix double RLock in Mesos cluster (apply PR #2210 to Mesos cluster)
 2016-07-12 14:14:08 -07:00
Ezra Silvera 3baf3e68e9 Fix double RLock in Mesos cluster 
Signed-off-by: Ezra Silvera <ezra@il.ibm.com>

format

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
 2016-07-12 12:17:46 -04:00
Ezra Silvera 265c55023c Check in pending tasks as well 
Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
 2016-07-12 10:55:00 -04:00
Ezra Silvera eac4981da8 check unique container name 
Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
 2016-07-12 10:55:00 -04:00
allencloud 0b544c93f7 update min docker engine's version swarm supports 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-12 09:51:39 +08:00
Dongluo Chen 5a6da69f6c Merge pull request #2163 from xianlubird/feature/rescheduler 
fix issue #2162 add removeDuplicateContainers behaviour for every node when it's added.
 2016-07-11 16:58:30 -07:00
Allen Sun ec5e048908 Merge pull request #2410 from rmoriz/issue-2409 
fix off-by-one error in server count
 2016-07-11 23:18:19 +08:00
Roland Moriz 6c408c3caf fix off-by-one error in server count 
Signed-off-by: Roland Moriz <roland@moriz.de>
 2016-07-11 17:11:13 +02:00