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

388 Commits

Author SHA1 Message Date
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
Victor Vieux f80556ce9c Merge pull request #1012 from vieux/disable_mesos_tests 
disable mesos tests because mesos is incompatible with the next version of docker
 2015-07-01 15:36:40 -07:00
Victor Vieux 8ad04fab7a skip test: docker attach through websocket 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-30 17:25:16 -07:00
Victor Vieux c3eaa00547 disable mesos tests because mesos is incompatible with the next version of docker 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-30 16:53:09 -07:00
Victor Vieux ca93c2a21a fix api/version.bats 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-30 15:25:40 -07:00
Victor Vieux 00e4e1c573 fix api_version test 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-30 11:48:08 -07:00
Alexandre Beslic 4fa9dbbfe0 lower ttl min for consul in integration tests 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-06-29 16:19:21 -07: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
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 19b0ddcf4d Merge branch 'refresh-config-fields' 2015-06-11 14:32:05 -07:00
Xian Chaobo 2389760e95 refresh config fields 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-11 14:28:21 -07:00
Victor Vieux 5acddc30b8 Merge pull request #916 from 4is2cbetter/fix_test_script 
cannot comment on one line command
 2015-06-11 11:53:22 -07:00
Peeyush Gupta fc9c5d70e7 Fixing errors in stress test 
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
 2015-06-10 14:39:31 +05:30
Lorenzo Affetti b7a8de4661 cannot comment on one line command 
Signed-off-by: Lorenzo Affetti <affox90@gmail.com>
 2015-06-10 09:38:17 +02:00
Victor Vieux a355d3c55e tweak tests in resource_management.bats 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-08 16:07:33 -07:00
Victor Vieux 0422253641 add a few tests in resource_management.bats 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-08 14:50:52 -07:00
Andrea Luzzardi a5b2e57496 Merge pull request #867 from abronan/fix_etcd_sync 
Fix etcd SyncCluster and Integration tests
 2015-06-05 15:56:37 -07:00
Chanwit Kaewkasi 74592b8462 integration tests for resource limitation 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-06-05 15:24:19 +07:00
Victor Vieux 6c9bf75dcd add -c test 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 17:15:13 -07:00
Victor Vieux 5b358156de Merge pull request #885 from vieux/use_inspect_from_mesos_0.23 
use inspect sent by mesos 0.23
 2015-06-04 15:39:03 -07:00
Victor Vieux e87f83d78c add test to make sure it doesn't deadlock 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 15:09:39 -07:00
Victor Vieux b661323bc3 Merge pull request #900 from chanwit/test-bridge-mode 
port filter integration test for bridge mode
 2015-06-04 14:56:46 -07:00
Victor Vieux 3cc53769ec Merge pull request #894 from vieux/mesos_in_ci 
Add mesos in the CI
 2015-06-04 14:40:19 -07:00
Victor Vieux 6dc6134163 add mesos in the CI 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 14:25:13 -07:00
Chanwit Kaewkasi 780a936b74 port filter integration test for bridge mode 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-06-05 02:11:27 +07:00
Victor Vieux d6bd288fb0 add docker run not enough resources test 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-02 14:35:58 -07:00
Alexandre Beslic c0fe0bc17d remove sleep in integration after etcd store startup, periodic SyncCluster in etcd and include fix to SyncCluster in go-etcd lib 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-28 15:54:29 -07:00
Alexandre Beslic 6eb5cd3b5c Fix etcd SyncCluster and Integration tests 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-28 09:47:11 -07:00
Andrea Luzzardi 84652ed537 Merge pull request #768 from jimmyxian/add-support-import 
Add support import
 2015-05-27 11:46:07 -07:00
Alexandre Beslic 23f66f8cc6 Merge pull request #858 from aluzzardi/addr-flag 
Replace --addr with --advertise
 2015-05-27 11:44:41 -07:00
Victor Vieux 2b5835a7cc Merge pull request #860 from abronan/add_test_removal 
pkg/store: Additional check in Node Removal integration test
 2015-05-27 10:55:28 -07:00
Xian Chaobo f63bafc7c5 add import integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-27 22:11:04 +08:00
Alexandre Beslic 838aab1d34 Add node back to the cluster after Node Removal test (after regression on zookeeper) 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-26 18:33:10 -07:00
Andrea Luzzardi 7394be0704 Replace --addr with --advertise 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-26 17:43:14 -07:00
Victor Vieux 300932b2d5 add slave_test.go, add tast_test.go 
add basic network mode support

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Timothy Chen <tnachen@gmail.com>
 2015-05-26 16:22:34 -04:00
Isabel Jimenez 19c14fde2e Adding integration tests, decline offers after 'SWARM_MESOS_OFFER_TIMEOUT', Tracking tasks and managing offers, refactoring list of slaves, queue create requests before processing them 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-05-26 16:21:54 -04:00
Victor Vieux 0b24992d7c Merge pull request #815 from jimmyxian/rmi_by_name 
Fix image match
 2015-05-26 10:43:59 -07:00
Andrea Luzzardi b4efc08dfc api: Integrate leader election. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-22 21:23:34 -07:00
Andrea Luzzardi a3950e7f65 Merge pull request #796 from jimmyxian/refresh-container 
Add Refresh container
 2015-05-21 18:30:47 -07:00
Alexandre Beslic b8d72c291d Cleanup, fix Integration tests and use of a single global Session in Consul 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-19 15:27:39 -07:00
Alexandre Beslic ec478d8ed5 Add integration tests for engines departure with node removal and ephemeral behavior 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-19 12:08:56 -07:00
Alexandre Beslic f81de46ab4 Fix Consul and etcd with latest changes, use etcd v2.0.11 for integration tests, remove call to SyncCluster for now (breaks the integration tests) 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-19 10:25:31 -07:00
Alexandre Beslic d5915b2a09 Merge pull request #811 from aluzzardi/node-removal 
Handle Node Removal from Discovery correctly
 2015-05-19 10:11:10 -07:00
Victor Vieux 7b3c889407 Merge pull request #809 from jimmyxian/bugfix-volumes-from 
fix #807: support --volumes-from rw/ro
 2015-05-18 19:41:36 -07:00
Andrea Luzzardi 7dec704b8a integration: node removal for file discovery 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:55:13 -07:00
Andrea Luzzardi 6fbbfd7287 integration: give zk some extra time. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:45:11 -07:00
Andrea Luzzardi ac18ef381d integration: cover more grounds in discovery testing. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi 9179ed3d34 integration: move discovery into its own folder 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi 7430fe5141 fix hb/timeout being time.Duration in a few places 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi 2a27adaea1 discovery integration: No need to wait anymore 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Xian Chaobo e555e8f021 merge volumes-from integration tests 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-16 08:22:17 +08:00
Xian Chaobo b94d6baf2b fix #807: support --volumes-from rw/ro 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-16 03:01:41 +08:00
Xian Chaobo ada8208157 remove retry in test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-15 05:12:22 -04:00
Xian Chaobo b89d07a1cf add rmi without tag integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-14 14:44:35 -07:00
Andrea Luzzardi ece52698d6 Merge pull request #783 from vieux/fix_image_match 
fix image.Match to take only repo or repo:tag
 2015-05-13 19:05:30 -07:00
Victor Vieux f9b457f152 fix image.Match 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-13 17:36:08 -07:00
Victor Vieux 59cd11b946 change swarm.heartbeat to swarm.discovery.heartbeat 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-13 15:48:07 -07:00
Victor Vieux 5db3a9cd0e remove options struct, yay! 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-13 15:36:30 -07:00
Victor Vieux a9eb48dcf2 Merge pull request #745 from aluzzardi/swarm-id 
Support for Swarm IDs
 2015-05-12 15:12:19 -07:00
Andrea Luzzardi f5ad970c87 integration: more debug into affinity 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-12 14:54:36 -07:00
Andrea Luzzardi b9cb4f4f35 integration: add debug to constraint 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-12 14:03:45 -07:00
Andrea Luzzardi dde47ee650 swarm IDs: Convert Swarm ID to Container ID in API Proxy. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:56:08 -07:00
Andrea Luzzardi b6a7c3d7f5 swarm ID: Remove backward compatibility. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:56:08 -07:00
Andrea Luzzardi 5c801d2c6a swarm id: Handle compatibility. 
Containers created with Swarm<0.3.0 or directly on the host without
going through Swarm don't have a Swarm ID. We are going to fake it by
using the Container ID.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:56:08 -07:00
Andrea Luzzardi abfe5e6f4c Add support for Swarm IDs. 
- Every container that gets created through Swarm gets a Swarm ID
  assigned (as a label).
- All API operations (start, stop, ...) can be performed by using either
  the container ID or the swarm ID.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:56:07 -07:00
Andrea Luzzardi d88105dbfe integration: minor cleanup of docker save multi-images 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:44:15 -07:00
Xian Chaobo 42af0fadd7 fix var name and integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-11 16:44:15 -07:00
Xian Chaobo 3962f6ffdf add-support-images-save 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-11 16:44:15 -07:00
Victor Vieux 5b3a03b852 Merge pull request #759 from aluzzardi/integration-race-fixes 
integration: Fix API races related to delay in refresh.
 2015-05-11 16:09:46 -07:00
Andrea Luzzardi abc5e4ebf1 Merge pull request #758 from chanwit/wait-for-zk-started 
integration: wait for zookeeper to start
 2015-05-11 15:44:59 -07:00
Sriram Natarajan e9f773f10f Etcd Integration test 
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
 2015-05-11 21:53:16 +00:00
Andrea Luzzardi fdd3513cbf integration: check status with ps filter rather than inspect. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-09 16:33:57 -07:00
Andrea Luzzardi a0973e6f91 integration: Fix pause test and make sure the cleanup is done properly. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-08 19:52:49 -07:00
Andrea Luzzardi 4bb035e41a integration: Fix API races related to delay in refresh. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-08 19:26:58 -07:00
Chanwit Kaewkasi d0320d78a6 integration: wait for zookeeper to start 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-05-09 08:44:48 +07:00
Andrea Luzzardi edb3504bc4 integration: affinities: add debug to help fix the test. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-08 18:23:52 -07:00
Andrea Luzzardi c8f0fa545a integration: events: Fix race condition in tests. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-08 18:22:55 -07:00
Sriram Natarajan 63492feb3f Integration test for consul discovery service 
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
 2015-05-08 21:11:31 +00:00
Xian Chaobo b986c151c5 fix all api tests which do not need to use run 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-07 22:07:34 -04:00
Andrea Luzzardi f50dedee66 Merge pull request #747 from vieux/fix_flacky_rm_test 
fix flacky rm test
 2015-05-07 17:30:58 -07:00
Victor Vieux aeb83be5df fix flacky rm test 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-07 16:21:43 -07:00
Victor Vieux 056f7150ab add test 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-07 16:08:50 -07:00
Victor Vieux a74d00d1c5 fix name checks 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-07 15:50:34 -07:00
Andrea Luzzardi 0556ad6d54 integration: ps --filter: wait for exited to containers to actual exit. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-07 01:32:49 -07:00
Andrea Luzzardi 64ae9eef9b integration: add some debug to ps 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-07 01:25:03 -07:00
Andrea Luzzardi c69f0db71f docker ps: Support for filters and improve state management. 
- `docker ps` now fully supports `--filter` flags
- Generate `Status` in `docker ps` dynamically. "Up X seconds" is now
  real-time.
- Misc cleanup.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 23:38:32 -07:00
Andrea Luzzardi f49fc12ff3 Merge pull request #719 from aluzzardi/regression-tests 
Regression tests
 2015-05-06 16:13:01 -07:00
Andrea Luzzardi 95511f1074 integration: force start_docker_with_busybox to only take the latest tag 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 15:47:53 -07:00
Andrea Luzzardi cfbb555bba integration: cleanup debug echo and test names 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 15:47:28 -07:00
Andrea Luzzardi c75992a3bd integration: faster. faster. faster. 
- Use start_with_busybox everywhere it's possible.
- Start only what we need.
- Improved correctness of a few tests at the same time.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 10:51:07 -07:00
Andrea Luzzardi 0bf6cf6dc9 integration helpers: add start_with_busybox 
starts an engine with a preloaded busybox without pulling (much faster).

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 10:51:07 -07:00
Andrea Luzzardi 7865004ec9 Merge pull request #725 from aluzzardi/discovery-integration-cleanup 
Discovery integration cleanup
 2015-05-06 10:50:11 -07:00
Andrea Luzzardi fad492bc41 integration: run the API test suite by default 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 00:35:55 -07:00
Andrea Luzzardi 85464cdc7c integration: split api into individual tests 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 00:35:55 -07:00
Andrea Luzzardi 75c54c22a1 integration helpers: allow tests to be located in subdirectories. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 00:35:02 -07:00
Andrea Luzzardi 8b89d8b615 integration: split api into individual tests 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 00:12:57 -07:00
Victor Vieux 09da40e0cc Merge pull request #726 from aluzzardi/integration-naming-cleanup 
integration: merge version-and-commits and main into cli.
 2015-05-05 23:52:56 -07:00
Andrea Luzzardi 68b8bfbe16 Merge pull request #663 from jimmyxian/add-events-search-stats-version-wait-integration-test 
Add events/search/stats/version/wait integration test
 2015-05-05 20:34:42 -07:00
Andrea Luzzardi ef1a1077cf Merge pull request #720 from jimmyxian/fix-attach-websocket 
bug fix: attach through websocket integration test
 2015-05-05 20:20:07 -07:00
Xian Chaobo b0b2290e25 using output instead of lines 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 23:13:58 -04:00
Andrea Luzzardi eb4df9db00 integration: merge version-and-commits and main into cli. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 19:52:25 -07:00