Commit Graph

1895 Commits

Author SHA1 Message Date
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
Victor Vieux
8e999214fb Merge pull request #1052 from gonkulator/master
Grammar regarding least and fewest
2015-07-14 11:49:24 -07:00
Victor Vieux
8935c892c3 Merge pull request #1054 from tombenner/fix_typo
Fix small typo ("an"/"ran") in installation docs
2015-07-14 11:48:59 -07:00
Victor Vieux
113601341a Merge pull request #1056 from rmg/preserve-exec-status
preserve status code from POST /containers/*/exec
2015-07-14 10:51:19 -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
Ryan Graham
9bd9fee7d6 preserve status code from POST /containers/*/exec
The docker remote API specifies that a 201 is returned on successful
creation of an Exec and a strict client will not accept that being
turned into a 200.

https://docs.docker.com/reference/api/docker_remote_api_v1.19/#exec-create

Resolves #1055

Signed-off-by: Ryan Graham <r.m.graham@gmail.com>
2015-07-12 15:31:59 -07:00
Tom Benner
08a77c19c8 Fix small typo ("an"/"ran")
Signed-off-by: Tom Benner <tombenner@gmail.com>
2015-07-11 00:09:05 -07:00
Victor Vieux
6ecab7f5b7 Merge pull request #942 from vieux/use_port_docker_offer
Allow multiple docker engines/mesos slaves in the mesos tests
2015-07-10 15:33:26 -07:00
Victor Vieux
d13c3b0ff9 Merge pull request #1053 from vieux/add_mesos_tests_back
add mesos tests back
2015-07-10 14:42:21 -07:00
moxiegirl
dc8ed32402 Merge pull request #1050 from elgalu/patch-1
Fix tiny typo "is is" with "is" in index.md
2015-07-10 13:57:11 -07:00
fl0yd
b0cbaeccae Grammar regarding least and fewest
Signed-off-by: Mark Oates fl0yd@me.com
Signed-off-by: Mark Oates <fl0yd@me.com>
2015-07-10 15:33:22 -05:00
Victor Vieux
d86cdc6ef5 Merge pull request #1051 from jimmyxian/fix-pull-image
fix #927 check pull status code
2015-07-10 10:44:11 -07:00
Leo Gallucci
014fa26875 Fix tiny typo "is is" with "is" in index.md
Signed-off-by: Leo Gallucci <leo.gallucci@zalando.de>
2015-07-10 09:59:38 +02:00
Victor Vieux
463b058b6d Merge pull request #1049 from vieux/update_mesos-go
update mesos-go
2015-07-09 16:07:43 -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
Victor Vieux
0d7dd1ad6f don't use PORTS
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-07 14:18:37 -07:00
Victor Vieux
82d3d64b7e update a test to use 2 slaves
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-07 13:37:33 -07:00
Victor Vieux
5a39d21707 use random port in mesos tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-07 13:37:33 -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
7e4a457a9a Merge pull request #1036 from Pensu/fix-simple-spelling
Fixing spelling of again
2015-07-07 11:48:51 -07:00
Victor Vieux
d7c11fab16 update mesos-go
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-07 08:35:47 -07:00
Xian Chaobo
402053fa00 fix #927 check pull status code
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-07-07 17:41:12 +08: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
Alexandre Beslic
151bb84316 Merge pull request #1034 from vieux/return_systemtime
/info now returns SystemTime
2015-07-06 19:34:34 -06:00
Victor Vieux
0268b1ce89 /info now returns SystemTime
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-06 17:56:35 -07: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
Victor Vieux
6be45b2ba7 Merge pull request #1033 from vieux/fix_static_go1.4
fix static compile with go 1.4
2015-07-06 17:20:34 -07:00
Victor Vieux
2d0d3c92b4 fix static compile with go 1.4
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-06 17:09:37 -07:00
Andrea Luzzardi
db35563311 Merge pull request #1031 from vieux/more_info
add name, http_proxy, https_proxy and no_proxy to docker info
2015-07-06 15:38:04 -07:00
Victor Vieux
8048703206 Merge pull request #953 from ahmetalpbalkan/unsetenv
Use os.Unsetenv in options_test
2015-07-06 15:32:06 -07:00
Victor Vieux
e10b4555e7 add name, http_proxy, https_proxy and no_proxy to docker info
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-06 15:17:48 -07:00
Victor Vieux
7a1734cae5 Merge pull request #1026 from abronan/fix_zookeeper_discovery
update libkv godeps, fix zookeeper discovery list
2015-07-06 14:15:56 -07:00
moxiegirl
78676e5dac Merge pull request #1020 from fl0yd/patch-1
Update README.md
2015-07-05 07:25:35 -07:00
moxiegirl
21040254c4 Merge pull request #1024 from moxiegirl/add_id_install
Troubleshooting revealed need id if title is the same
2015-07-05 06:37:20 -07:00
Alexandre Beslic
814a8168ee update libkv godeps, fix zookeeper discovery list
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-07-04 18:37:13 -07:00
Mary Anthony
29ff252766 Troubleshooting revealed need id if title is the same
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-03 21:43:28 -07:00
fl0yd
168e31c096 Update README.md
Signed-off-by: Mark Oates fl0yd@me.com
Signed-off-by: Mark Oates <fl0yd@me.com>
2015-07-02 13:18:30 -05:00
Alexandre Beslic
d0b049196e Merge pull request #1019 from jimmyxian/fix-attach-websocket-test
Fix websocket attach integration test
2015-07-02 11:10:12 -07:00
Xian Chaobo
83d1f65e85 fix attach websocket test
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-07-02 08:13:52 -04:00
Victor Vieux
34636b29fc Merge pull request #1018 from mountkin/fix-1006
update deps
2015-07-01 21:45:54 -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
Shijiang Wei
8bfac6bd71 update deps
Fixes https://github.com/docker/swarm/issues/1006

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-07-02 11:11:29 +08:00
Victor Vieux
930fefc06d Merge pull request #1013 from moxiegirl/fix-issue-997
Switch to install
2015-07-01 17:50:32 -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
Victor Vieux
2b4562482f Merge pull request #1014 from abronan/remove_consul_config
Fix storage integration tests
2015-07-01 15:39:53 -07:00