centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,968 Commits 57 Branches 28 Tags
c2efaadbea83ea534f86e5cf3a1e47d0dccab698
Commit Graph

259 Commits

Author SHA1 Message Date
Andrea Luzzardi
b32f0da81d Merge pull request #1127 from chanwit/natural-sort 
Natural sorting for Engine names
 2015-08-07 17:36:08 -07:00
Veres Lajos
0d94d7a11a typofix - https://github.com/vlajos/misspell_fixer 
Signed-off-by: Veres Lajos <vlajos@gmail.com>
 2015-08-07 23:06:16 +01:00
Chanwit Kaewkasi
974a482d16 implemented naturalsorter for engine 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-08-06 11:35:49 -04:00
James Wang Yong Qiao
88bbdff2e0 Fix the spell error. 
Signed-off-by: James Wang Yong Qiao <jamesyongqiao@gmail.com>
 2015-08-05 02:44:31 -04:00
Andrea Luzzardi
3bb4373f9f Merge pull request #1111 from vieux/no_json_manual 
do not generate JSON by hand
 2015-08-04 15:30:30 -07:00
Victor Vieux
2606db4486 Merge pull request #1085 from jimmyxian/improve-build 
Improve build
 2015-08-04 11:44:17 -07:00
Xian Chaobo
a3cf5b9e9c improve build 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-08-04 02:45:06 -04:00
mariusz
2605d398b6 Updated the identifier as requested by @aluzzardi 
Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
Tickle Jenkins
 2015-07-31 16:32:12 -07:00
mariusz
e1daa7c47b Error from Engine when refresh doesn't pickup new container 
Fix for https://github.com/docker/swarm/issues/1081
    Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
 2015-07-31 11:21:24 -07:00
mariusz
9dc65ca480 Avoid nil pointer dereference in (*Cluster).createContainer 
Swarm.Create car return nil,nil when refresh fails
due to network hiccup

Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
 2015-07-31 11:21:24 -07:00
Victor Vieux
7ec33a81b5 do not generate JSON by hand 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-30 18:10:13 -07:00
Alex Chan
a27c2e2d43 Fix a pair of typos in the docs 
Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
 2015-07-29 13:53:13 +01:00
Victor Vieux
39309f7a62 rename n to e 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-16 11:55:33 -07:00
Victor Vieux
542620d60d support docker run -p <port> in mesos (random) 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-16 11:24:45 -07:00
Victor Vieux
248370469f add hostname support 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-14 15:25:38 -07:00
Victor Vieux
b3385caa4e add env support in mesos 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-14 14:47:47 -07:00
Victor Vieux
ef2d11899a Merge pull request #1058 from vieux/add_events 
add events to mesos and a few tests
 2015-07-14 14:40:24 -07:00
Victor Vieux
f00e6aa967 add events to mesos and a few tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-14 14:20:17 -07:00
Alexandre Beslic
1a5881ec49 Merge pull request #971 from jimmyxian/reschedule-with-image 
Reschedule with soft image affinity
 2015-07-13 09:11:18 -07:00
Victor Vieux
49d475228e use docker_port from offer is present 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-07 13:37:33 -07:00
Victor Vieux
b18b5bf9f7 add mesos tests back 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-07 13:27:40 -07:00
Victor Vieux
28c62b1fcf Merge pull request #1017 from vieux/hostname_mesos 
override hostname in mesos
 2015-07-09 14:14:55 -07:00
Peeyush Gupta
fa0cc6d1df Fixing spelling of again 
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
 2015-07-07 11:09:39 +05:30
Xian Chaobo
0037c31a95 fix func name and use extracExprs 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-07-07 11:30:26 +08:00
Victor Vieux
edb72d0744 always override hostname in mesos 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-06 17:35:53 -07:00
Ahmet Alp Balkan
6113e89004 Use os.Unsetenv in options_test 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-07-01 20:25:52 -07:00
Victor Vieux
895d820774 Merge pull request #964 from jimenez/task_timeout_flag 
making task timeout configurable
 2015-07-01 16:51:33 -07:00
Isabel Jimenez
305050025c making task timeout configurable 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-07-01 18:58:17 -04:00
ealang
15fc8d8210 Prevent panic if a container is removed during a refresh 
If InspectContainer fails, Engine.containers gets set to nil.

Log cause of updateContainer failure.

Signed-off-by: Eric Lang <ealang@gmail.com>
 2015-06-29 22:04:15 -05:00
Isabel Jimenez
d86ab642fb adding implementation for TotalMemory and TotalCpus 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-06-15 21:05:27 -04:00
Xian Chaobo
05ba86d329 golint and add integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-06-16 08:46:17 +08:00
Xian Chaobo
8cd667e996 add unit test for AddSoftImageAffinity 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-06-16 07:52:53 +08:00
Xian Chaobo
8c7c0b248b reschedule with soft image affinity 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-06-16 07:52:00 +08:00
Andrea Luzzardi
82fc920e90 Engine: fix panic in disconnect with events. 
Replaces #937

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-06-12 18:51:05 -07:00
Victor Vieux
53e88f3712 Merge pull request #933 from vieux/support_1.6.x+ 
Support 1.6.0+
 2015-06-12 15:58:52 -07:00
Victor Vieux
1afc1be2d1 support only 1.6.0+ 
update test/regression/run.sh
uddate doc
update tests

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-12 13:27:15 -07:00
Victor Vieux
bc418df194 Merge pull request #936 from vieux/getting_started_mesos 
add very simple getting started for mesos
 2015-06-12 13:07:11 -07:00
Victor Vieux
3f0c3bc1c7 add getting started mesos 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-12 11:49:41 -07:00
Victor Vieux
4f688db989 disconnect on duplicate 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-11 15:09:37 -07:00
Victor Vieux
c44151ff4a pretty print mesos offers 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-09 17:30:14 -07:00
Victor Vieux
12dac7560a fix lock in cluster.go 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-09 12:18:38 -07:00
Victor Vieux
3a1df50ed5 improve locks in queue.go 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-09 11:43:21 -07:00
Andrea Luzzardi
47dbb5a30d Merge pull request #902 from vieux/improve_docker_info 
Improve docker info against 1.7
 2015-06-05 15:52:13 -07:00
Marco Mancini
9e27ae9140 Fix reserved cpus computation 
Added test as Vieux suggested/Fixed CpuShare computation

Signed-off-by: Marco Mancini <marcomancini72@gmail.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 18:59:15 -07:00
Victor Vieux
c1020da636 nits 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 18:25:51 -07:00
Victor Vieux
4f9c9f5867 use dockerclient structs 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 18:25:51 -07:00
Victor Vieux
2bf6c1a529 improve docker infi with 1.7 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 18:25:51 -07:00
Victor Vieux
15a8b73ab6 fix cpus 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 17:26:32 -07:00
Victor Vieux
4212b69c96 use inspect sent by mesos 0.23 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 14:42:37 -07:00
Victor Vieux
e8445ed8ce fix panic is disconnect 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 11:27:17 -07:00