Victor Costan
e32b3211ae
Swarm filters support in image building.
...
When building an image (POST /build), swarm will extract filters from
buildargs. This is similar to how container creation (POST
/containers/create) extracts filters from environment variables.
Signed-off-by: Victor Costan <costan@gmail.com>
2015-10-23 14:24:42 -04:00
Xian Chaobo
c947d5be69
add support some run options
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-22 09:14:23 +08:00
Alexandre Beslic
50671ab6f3
Integration test for regression with parallel docker run when specifying a port
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-21 02:59:04 -07:00
Victor Vieux
2c2aa91f9f
fix test Dockerfile, use precompiled go
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-19 09:55:27 -07:00
Victor Vieux
07a102adc8
fix tests
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-19 15:46:38 -07:00
Alexandre Beslic
755e68b5cf
Fix timing issue on zookeeper failure test
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-15 08:52:00 -07:00
Victor Vieux
bef2892cee
Merge pull request #1271 from jimmyxian/fix-reschedule-with-soft-affinity
...
Do not try retry with soft-image-affinity when have node constraint
2015-10-15 13:52:29 -07:00
Alexandre Beslic
ecb7eabe4f
Merge pull request #1291 from vieux/update_libnetwork
...
update libnetwork
2015-10-13 17:33:38 -07:00
Victor Vieux
d000d70238
update libnetwork
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 17:06:21 -07:00
Alexandre Beslic
1e30ce215f
Merge pull request #1262 from vieux/libnetwork
...
add 'docker network' support
2015-10-13 11:09:27 -07:00
Victor Vieux
5cbf0667c8
remove unused store test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 04:15:55 -07:00
Xian Chaobo
f6134de8c6
fix rename test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-10 16:55:52 +08:00
Victor Vieux
df5c394308
add store test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
Victor Vieux
587d535188
add support docker connect / disconnect
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
Victor Vieux
78ecf8497c
Add network rm
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
Victor Vieux
b007cae8b2
Add docker network create
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Victor Vieux
12c2d46dd5
prepend engine name on network name
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-08 22:35:07 -07:00
Victor Vieux
e634df03a7
add 'docker network ls' support
...
add 'docker network inspect' suport
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Alexandre Beslic
5f807caef1
Merge pull request #1252 from vieux/fix_detach_exec
...
fix exec -d
2015-10-08 18:32:07 -07:00
Victor Vieux
793461daff
fix volume tests with the last docker engine
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 18:14:32 -07:00
Xian Chaobo
c6fb10cec3
fix soft filter
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-08 05:16:19 -04:00
Xian Chaobo
315ddfeb4d
do not try retry with soft-image-affinity when have node constraint
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-08 05:06:39 -04:00
Victor Vieux
94d2375919
Merge pull request #1258 from abronan/change_replication_ttl_flag
...
Replace --leaderTTL flag by --replication-ttl
2015-10-06 14:09:15 -07:00
Alexandre Beslic
9521a1a964
Update etcd image in integration tests to 2.2.0
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-05 09:02:37 -07:00
Daniel Nephin
8abf7d32e9
Support filtering images by labels
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 15:45:52 -04:00
Alexandre Beslic
c74cf900ef
Replace --leaderTTL flag by --replication-ttl
...
Fixes #1256
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-02 08:42:14 -07:00
Victor Vieux
26785556fa
fix exec -d
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-01 07:29:38 -07:00
Daniel Nephin
a869995eb5
Use smaller zk image.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-30 17:14:39 -04:00
Xian Chaobo
67bfdd67a6
Merge pull request #1236 from abronan/test_leader_failure
...
Add integration test for leader election in the event of a backend store failure
2015-09-30 09:16:39 +08:00
Alexandre Beslic
4c02659078
Merge pull request #1247 from vieux/mesos_dockerfiles
...
test against mesos 0.24.1
2015-09-29 16:09:03 -07:00
Victor Vieux
9e6d8eeda0
add mesos 0.22.1 and 0.23 dockerfiles
...
add mesos 0.24.0 and 0.24.1 dockerfiles
use mesos 0.24.1 in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-29 15:54:22 -07:00
Victor Vieux
be87111634
use zookeeper 3.4.6 in the tests
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-29 14:41:56 -07:00
Alexandre Beslic
988a3acb6b
increase node removal check retry time in zookeeper integration tests
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-25 08:00:04 -07:00
Victor Vieux
8ac69722b1
Merge pull request #1228 from abronan/leader_election_lock_ttl
...
Add the support for specifying Leader Election TTL
2015-09-24 11:46:50 -07:00
Alexandre Beslic
ca20e4ca00
add integration test for leader election in the case of store failure
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-24 09:43:13 -07:00
Victor Vieux
829db076c3
update compose in tests
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-23 12:06:32 -07:00
Alexandre Beslic
a792519978
Merge pull request #1208 from vieux/volume_create_delete
...
docker volume create & docker volume delete
2015-09-23 10:45:44 -07:00
Alexandre Beslic
ab8d1b489c
add support for specifying the leader election lock ttl
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-23 04:06:35 -07:00
Victor Vieux
fdeb8d88ef
fix test images, busybox is only one layer now
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-19 07:07:16 -07:00
Xian Chaobo
063f5dbab4
Merge pull request #1204 from MHBauer/events-until
...
implement `--until` flag for swarm api
2015-09-22 09:13:02 +08:00
Victor Vieux
53357d88fd
Merge pull request #1213 from jimmyxian/fix-import-load-return-code
...
Fix import/load return code
2015-09-21 17:13:07 -07:00
Victor Vieux
76591d20c1
Merge pull request #1219 from jimmyxian/fix-connect-event
...
Fix connect event
2015-09-18 23:07:04 -07:00
Morgan Bauer
b1d3b625de
implement `--until` flag for swarm api
...
- mostly copied the idea from base docker
- refactored the locking in event handling
- integration test for until flag
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-09-18 14:20:30 -07:00
Victor Vieux
79d1ee4861
add volume create
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:23:22 -07:00
Victor Vieux
440a379860
docker volume rm
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:22:57 -07:00
Victor Vieux
068a587f17
fix issue with last docker
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:06:14 -07:00
Xian Chaobo
8fa6420e11
add integration test for connect/disconnect events
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-18 05:13:52 -04:00
Victor Vieux
88ff2baa96
fix race in tests
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-17 15:26:10 -07:00
Xian Chaobo
5cc6e3f30c
fix import/load return code
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-15 10:00:49 -04:00
Victor Vieux
e6d81e1a43
Merge pull request #1206 from jimmyxian/fix-pull-return-code
...
Fix pull return code
2015-09-14 13:25:05 -07:00
Morgan Bauer
e89093e820
try to use gnu version of readlink if available
...
- fail early if readlink doesn't exist or is the wrong version
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-09-11 15:25:33 -07:00
Xian Chaobo
a10a39c462
fix pull return code
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-10 04:10:28 -04:00
Chanwit Kaewkasi
30cfdfb12d
Merge pull request #1196 from vieux/initial_volume_support
...
add support for docker volume ls & inspect
2015-09-09 09:56:39 +07:00
Victor Vieux
0579920c0d
Merge pull request #1166 from chanwit/image-dedup
...
Implement grouping list of images by Id
2015-09-08 11:52:43 -07:00
Victor Vieux
77c96908f0
add support for docker volume ls & inspect
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-05 07:56:22 -07:00
Chanwit Kaewkasi
45e091bca5
implement grouping list of images by Id
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-09-04 02:15:05 +07:00
Victor Vieux
6678a167fe
update discovery url
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-02 21:04:04 -07:00
Victor Vieux
d571b7e39e
Revert "prevent double starts with mesos"
...
This reverts commit 9a93dcf46b
.
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-02 20:33:49 -07:00
Chanwit Kaewkasi
4cdbe875b8
Merge pull request #1155 from vieux/fix_mesos_logs
...
prevent double logs with mesos
2015-09-03 13:10:52 +07:00
Victor Vieux
16ac82a509
switch to golang 1.5
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-01 04:18:39 -07:00
Victor Vieux
2accd82815
@test "mesos - docker run short lived"
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-01 03:09:03 -07:00
Victor Vieux
42bb1f3f5b
Merge pull request #1159 from jimmyxian/fix-tag-images
...
fix tag image
2015-09-01 11:25:48 -07:00
Alexandre Beslic
9dae3729a1
Merge pull request #1150 from vieux/add_compose_tests
...
add a few tests with docker-compose
2015-09-01 11:21:41 -07:00
Victor Vieux
9a93dcf46b
prevent double starts with mesos
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-31 22:52:43 -07:00
Victor Vieux
82b3c2f344
choose docker-compose version
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-31 22:19:17 -07:00
Xian Chaobo
29df83a349
fix tag image
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-31 07:17:30 -04:00
Xian Chaobo
12e956e681
add support force remove images
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-19 23:09:02 -04:00
Victor Vieux
a579e404a4
add a few tests with docker-compose
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-15 14:20:26 -07:00
Xian Chaobo
d4daee4f27
add support images -a
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-12 07:39:11 -04:00
Chanwit Kaewkasi
d82186e4de
Merge pull request #1145 from vieux/better_bats_display
...
udpate bats display in janky
2015-08-11 14:47:19 -04:00
Victor Vieux
6c8578bda5
udpate bats display in janky
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-08-11 11:43:01 -07:00
Victor Vieux
2a70ff3e1f
display only containers created by swarm in mesos
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-10 22:51:39 -07:00
Andrea Luzzardi
d580bf9b7b
Merge pull request #1133 from vieux/use_0.23_mesos
...
use mesos 0.23 in tests
2015-08-10 15:28:08 -07:00
Victor Vieux
6f52d113a4
remove useless swarm_manage_mesos function
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-10 14:21:49 -07:00
Victor Vieux
32320e4249
use mesos 0.23 in tests
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-07 18:45:06 -07:00
Andrea Luzzardi
c2efaadbea
Merge pull request #1123 from vieux/add_before_support
...
add support for --before in ps
2015-08-07 17:38:42 -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
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
Victor Vieux
31932311a1
add support for --before in ps
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-01 16:41:48 -07:00
Victor Vieux
d594680e4f
fix stats test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-30 21:22:44 -07:00
Victor Vieux
b8f50bbf1f
disable mesos tests again
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-30 14:09:18 -07:00
Victor Vieux
bcc28f658d
disable docker attach websocket test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-18 21:48:05 -07:00
Victor Vieux
fe4163148f
fix docker wait test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-18 21:47:41 -07:00
Victor Vieux
05234232a3
switch tests to overlay
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-18 21:01:11 -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
Andrea Luzzardi
cafca42239
Integration test for leader election
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-07-28 18:26:52 -07:00
Andrea Luzzardi
22dcdc245d
integration helpers: Allow to run multiple managers.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-07-28 18:26:17 -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
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
b18b5bf9f7
add mesos tests back
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-07 13:27:40 -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
Xian Chaobo
83d1f65e85
fix attach websocket test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-07-02 08:13:52 -04:00
Andrea Luzzardi
12ba56e62e
Merge pull request #1015 from vieux/skip_attach_websocket
...
skip test: docker attach through websocket
2015-07-01 15:38:12 -07:00