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
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
Xian Chaobo b5756d6018 check pull status 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 22:40:14 -04:00
Andrea Luzzardi 2815f100bd Merge pull request #724 from vieux/fix_affinity_images_test 
fix affinities.bats and add test in affinity_test.go
 2015-05-05 19:32:47 -07:00
Andrea Luzzardi a2703e0562 integration: helpers cleanup. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 19:19:10 -07:00
Andrea Luzzardi 3501e45f4f integration: Improved discovery testing. 
Verify that swarm can see new nodes joining discovery.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 19:14:59 -07:00
Andrea Luzzardi 4ac91fd7cd integration helpers: Revamped swarm join/manage. 
- swarm_join can be called multiple times. Only new nodes will join the
  discovery.
- swarm_join won't return until the nodes are visible in discovery
  (swarm list).
- swarm_manage won't return until the nodes are visible in the manager.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 18:35:16 -07:00
Andrea Luzzardi bd3c5c3636 Revert "use retry to wait for swarm join" 
This reverts commit 89fe217e12.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>

Conflicts:
	test/integration/helpers.bash
 2015-05-05 18:35:09 -07:00
Xian Chaobo f6254241df using docker_host instead of docker 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 21:09:25 -04:00
Xian Chaobo 2e874d3148 fix issue: #701 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 21:08:01 -04:00
Victor Vieux 9d267e5285 fix affinities.bats 
and add affinity_test.go

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-05 17:58:13 -07:00
Victor Vieux 83ed309da6 do not use -f in tests 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-05 16:08:38 -07:00
Andrea Luzzardi bca0e2e8c2 integration: cleanup discovery tests 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 16:06:41 -07:00
Alexandre Beslic 92abcac33c Merge pull request #706 from jimmyxian/bug-fix-exec 
bug fix: check status code in exec
 2015-05-05 14:32:39 -07:00
Andrea Luzzardi e6d853326f regression tests: Initial version. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 14:10:56 -07:00
Xian Chaobo a313f46bb8 add test when container is not running 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 04:55:17 -04:00
Andrea Luzzardi 1187069407 integration: fix nodes patterns in docker_swarm info 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 00:20:22 -07:00
Andrea Luzzardi b7413d3138 integration helpers: fix the wait for docker join 
It used to output `[: -eq: unary operator expected` since the grep
command didn't give any output, therefore generating a syntax error.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:52:34 -07:00
Andrea Luzzardi 389da48e5e integration: skip dependency tests 
They rely on docker inspect --format and it's currently broken on docker
master.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:22:46 -07:00
Andrea Luzzardi 2605eff5fc discovery integration: fix for docker master 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:20:42 -07:00
Andrea Luzzardi 88033393ba api integration: Fixes for docker master. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi 5d10f47b32 integration helpers: move the docker_ functions together 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi b4af7acd83 integration: Run tests using docker master. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi 3bb37e671a integration runner: Use the same CLI as the one available in the image. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi 2ba8acbaca integration: Ensure the client and server are running the same version. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi 86bf53a504 integration: Support using a different CLI. 
- `docker` will now use the CLI defined in $DOCKER_BINARY
- In order to communicate with the host docker, one must use
  `docker_host`

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi fdf74cef2a Merge pull request #465 from chanwit/test-create-cluster-on-hub 
integration: add a test to verify creating cluster on hub
 2015-05-04 22:00:37 -07:00
Chanwit Kaewkasi 6ecf51f458 add integration test for token discovery 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-05-05 11:44:47 +07:00
Chanwit Kaewkasi 89fe217e12 use retry to wait for swarm join 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-05-05 11:44:47 +07:00
Xian Chaobo 35026de4c4 bug fix 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 12:31:09 +08:00
Andrea Luzzardi 4b3bc9b35b integration: Fix tests in jenkins. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 20:35:56 -07:00
Andrea Luzzardi 6df673372f integration: Use aufs by default. 
The problem has been fixed in the dind images.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 17:29:00 -07:00
Andrea Luzzardi a2862280f1 integration: Added missing dependency to Dockerfile. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 17:25:02 -07:00
Andrea Luzzardi 97aad7e60c fix attach integration test 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 15:18:03 -07:00
Andrea Luzzardi c236e2f11d integration runner: run tests on a fresh binary. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 14:46:00 -07:00
Andrea Luzzardi 2600c8823b integration tests: Support for running within Docker. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 14:46:00 -07:00
Andrea Luzzardi f50af455fa integration tests: Don't build binaries anymore, it's too slow. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 14:20:28 -07:00
Andrea Luzzardi ad98b865b7 integration: Run engines with --net=host. 
Since we were mapping the port back to the host anyway, this doesn't
change anything.

However, it does fix `docker exec`.

Fixes #658

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 13:36:36 -07:00
Andrea Luzzardi 3cc8a2b5fd Merge pull request #703 from aluzzardi/integration-image 
integration: Use the brand new dind image.
 2015-05-04 13:43:38 -07:00
Xian Chaobo da2261f0be using timeout in wait 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-04 21:28:20 +08:00
Xian Chaobo 2f049ccf4f use retry 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-04 18:41:23 +08:00
Xian Chaobo d884b46272 specific node for events 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-04 18:41:23 +08:00
Xian Chaobo d1bc9e3407 bug fix 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-04 18:41:23 +08:00
Xian Chaobo f83b3daabb add events-search-stats-version-wait integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-04 18:41:23 +08:00
Andrea Luzzardi 24aaaa029e integration: Use the brand new dind image. 
We now have dockerswarm/dind:
- Much more lightweight.
- Exists in every version since Docker 1.0.0.

Depends on #700 as it cannot run on aufs.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-03 19:20:47 -07:00
Andrea Luzzardi 671ddc8feb integration tests: run with native/vfs by default. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-03 19:08:02 -07:00
Andrea Luzzardi 92f8c8ec60 Merge pull request #693 from aluzzardi/integration-retry 
integration: Add the re-usable "retry" helper.
 2015-05-02 16:17:38 -07:00
Andrea Luzzardi f9a03c62f1 integration: Add the re-usable "retry" helper. 
Retry was kind of extracted from wait_until_reachable. The goal is to be
able to wait for a command to succeed, or fail if it doesn't succeed
after a defined number of attempts.

Indirectly improve the error logging: the output of the retry command
won't show up unless it constantly failed.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-30 20:09:54 -07:00
Andrea Luzzardi 85b4163f69 travis: Lint test files (ensure they are not space indented) 
Fixed tab/spaces for existing integration tests.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-30 17:31:14 -07:00
Andrea Luzzardi b39e023e03 Merge pull request #673 from vieux/labels_storage 
store constraints and affinities as labels
 2015-04-30 14:36:23 -07:00
Victor Vieux f53b5df834 store constaints and affinities in labels 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-30 14:33:21 -07:00
Alexandre Beslic 5872d4c7b0 Merge pull request #688 from aluzzardi/fix-integration 
fix integration test build of swarm
 2015-04-30 14:32:34 -07:00
Sriram Natarajan 1b7d8ce5d3 Add Integration test for dependency filters 
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
 2015-04-30 20:37:53 +00:00
Andrea Luzzardi 29deacba2f fix integration test build of swarm 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-30 13:28:13 -07:00
Andrea Luzzardi 3e8d48f98e Merge pull request #655 from jimmyxian/add-cp-export-history-save-integration-test 
Add cp/export/history/save integration test
 2015-04-30 11:39:33 -07:00
Andrea Luzzardi e7cfa95b39 Merge pull request #637 from jimmyxian/add-commit-exec-rename-test 
Add commit/exec integration test
 2015-04-30 11:36:54 -07:00
Andrea Luzzardi b71d5fa19c Fix integration test cleanup. 
- Do not run swarm using a function since it forks a subshell and we end
  up killing it instead of the binary.
- Build a binary at each run instead of using go run. This is faster and
  fixes the cleanup for the same reason as the subshell.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-28 15:47:25 -07:00
Victor Vieux 0924df6250 fix error message in tets 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-27 13:47:53 -07:00
Andrea Luzzardi 24396d8509 Merge pull request #669 from jimmyxian/improve-rename 
improve rename
 2015-04-27 12:39:48 -07:00
Andrea Luzzardi 30790fb1e3 Merge pull request #667 from vieux/affinity_labels 
Affinity labels like  `-e affinity:com.example.type==test`
 2015-04-27 12:36:07 -07:00
Andrea Luzzardi 9fd2a3ebc2 Merge pull request #679 from vieux/build 
use godep go run everywhere in tests
 2015-04-27 12:28:10 -07:00
Victor Vieux 622cd84f59 Merge pull request #666 from abronan/add_warning_integration_test 
Add note against using devicemapper as a storage driver to run the integration tests
 2015-04-27 11:53:49 -07:00
Victor Vieux c7746f9463 use godep go run everywhere in tests 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-27 10:45:45 -07:00
Victor Vieux 6028616892 fix syntax error in tests 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-27 10:37:39 -07:00
Victor Vieux a2dc4b87c5 added image affinity test and != 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-27 10:05:38 -07:00
Xian Chaobo 3d2537eb84 move check into cluster and rename func 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-27 08:20:55 -04:00
Xian Chaobo b47e002e6c improve rename and update dockerclient 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-24 21:09:26 -04:00
Andrea Luzzardi d6011b4bc6 Merge pull request #609 from jimmyxian/add-support-imageload 
Add support "docker load" api
 2015-04-24 17:21:11 -07:00
Andrea Luzzardi 34196afc2d Merge pull request #654 from jimmyxian/add-images-pull-tag-integration-test 
Add images/pull/tag integration test
 2015-04-24 16:24:12 -07:00
Victor Vieux 28a358d9b2 use docker 1.6, add affinity tests and add doc 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-23 16:10:34 -07:00
Alexandre Beslic e016344d3f Add note against using devicemapper as a storage driver to run the integration tests 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-04-23 14:55:02 -07:00
Alexandre Beslic cf946d35f9 Merge pull request #652 from jimmyxian/add-pause-unpause-inspect-integration-test 
Add pause/unpause/inspect integration test
 2015-04-22 19:54:21 -07:00
Xian Chaobo 33dc4455eb bug fix 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-22 21:56:24 -04:00
Xian Chaobo 9ab51c796d add more notes 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-22 21:12:17 -04:00
Xian Chaobo e1abb65729 add images-pull-tag integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-22 21:12:17 -04:00
Andrea Luzzardi 292be62cce Merge pull request #653 from jimmyxian/add-logs-run-rmi-rm-integration-test 
Add logs/run/rmi/rm integration test
 2015-04-22 14:28:05 -07:00
Andrea Luzzardi 48fc5024d3 Merge pull request #620 from jimmyxian/start-stop-restart-kill-integration-test 
add create/start/stop/restart/kill integration test
 2015-04-22 14:23:43 -07:00
Xian Chaobo a96f7508ec cp add checksum and bug fix 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-22 09:49:02 +08:00
Xian Chaobo 35ff088604 add commit exec integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-22 08:59:12 +08:00
Andrea Luzzardi 7c4f866926 Merge pull request #636 from jimmyxian/add-attach-websocket-integration-test 
Add attach-ws api integration test
 2015-04-21 14:06:36 -07:00
Sriram Natarajan 9f29e95abc Add Node Labels to Cluster Info information 
Updates: docker info output and /info API
Check for labels in API integration tests

Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
 2015-04-21 20:30:19 +00:00
Xian Chaobo c3112adb55 add unpause after pause and add inspect node verify 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-22 00:11:27 +08:00
Xian Chaobo ac3e6d677e bug fix 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-21 22:53:41 +08:00
Xian Chaobo 76c8c18bc9 pause fix 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-21 16:17:32 +08:00
Victor Vieux 279ce86c40 Merge pull request #642 from aluzzardi/cli-cleanup 
Cleanup: Move CLI related files to a subpackage.
 2015-04-20 12:00:47 -07:00
Xian Chaobo 33eedfa1d9 update api README.md and using tab instead of whitespace 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-20 03:02:50 -04:00
Xian Chaobo c4d5b76db7 enhance load integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-19 23:11:29 -04:00
Andrea Luzzardi 86ed98baa2 integration: Run swarm using go run. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-18 20:26:55 -07:00
Xian Chaobo 65d397b0bb add logs-run-rmi-rm integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-17 11:37:37 +08:00
Xian Chaobo 2ec8446344 remove FIXME 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 23:11:18 -04:00
Xian Chaobo 854b97c75c change the way to make temp file 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-17 11:05:55 +08:00
Xian Chaobo cb60e83615 format fix 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-17 10:22:03 +08:00
Xian Chaobo 59c5b6b317 use WaitGroup and move test in api.bats 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 22:10:39 -04:00
Xian Chaobo 293abe06f4 add pause/unpause/inspect integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-17 09:56:24 +08:00
Xian Chaobo 820804b108 update load-image integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 21:50:46 -04:00
Xian Chaobo f200e9a954 rebase and update test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 21:50:46 -04:00
Xian Chaobo 7da46216e0 integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 21:50:46 -04:00
Andrea Luzzardi b548683b32 integration: Fix docker build API test 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-16 18:41:30 -07:00
Xian Chaobo 58f14dae33 add cp/export/history/save integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-17 09:02:20 +08:00
Xian Chaobo fbd8ac5cc8 add attach-ws api integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-17 08:05:42 +08:00
Andrea Luzzardi 9ac7dd2402 Merge pull request #603 from vieux/add_build 
Proposal: Add build support on a random node
 2015-04-16 16:21:38 -07:00
Victor Vieux 3315f0e6cc Merge pull request #629 from aluzzardi/stress-test 
stress test: First short at stress testing Swarm in an automated way.
 2015-04-16 15:57:10 -07:00
Xian Chaobo 5841d0f98e add attach-diff-port-top integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-17 06:11:52 +08:00
Xian Chaobo 7ac2948697 bug fix 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-17 05:03:27 +08:00
Xian Chaobo 6d5e9af343 enhance test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-17 04:57:30 +08:00
Victor Vieux 05b01c7b43 forcerefresh after build and add test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-04-16 12:22:09 -07:00
Victor Vieux f94d78cecf Merge pull request #628 from aluzzardi/api-integration-tests 
integration: Add skeleton for missing integration tests.
 2015-04-16 12:08:25 -07:00
Xian Chaobo fc692741d7 add attach-diff-port-pull-top integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 23:44:50 +08:00
Xian Chaobo 805b826161 add create-start-stop-restart-kill integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 22:43:08 +08:00
Andrea Luzzardi 20d7a2bde4 stress test: First short at stress testing Swarm in an automated way. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-15 21:09:42 -07:00
Andrea Luzzardi 62afd8133a integration: Fix swarm_manage helper with custom discovery. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-15 19:39:12 -07:00
Andrea Luzzardi 05802bba5a integration: Add skeleton for missing integration tests. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-15 18:16:07 -07:00
Andrea Luzzardi 7c62291d47 Merge pull request #581 from chanwit/test-file-discovery 
integration: test for file discovery
 2015-04-13 12:07:40 -07:00
Chanwit Kaewkasi 20dd07354d add the integration test for file discovery 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-04-11 07:55:04 +07:00
Andrea Luzzardi 6947d27e18 api integration tests: Indent with tabs rather than spaces 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-10 11:33:06 -07:00
Andrea Luzzardi 258492faa7 Fix integration tests for swarm_manage changes 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-10 11:31:15 -07:00
Andrea Luzzardi b250a3a5cf Merge pull request #582 from chanwit/test-zk-discovery 
integration: test for ZooKeeper discovery
 2015-04-09 20:11:30 -07:00
Chanwit Kaewkasi 6102c1d357 add port filter for the host mode 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-04-10 00:32:10 +07:00
Chanwit Kaewkasi e9cd9ba234 add integration test for zookeeper discovery 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-04-10 00:05:08 +07:00
Chanwit Kaewkasi b1803bc7e5 regression for 0.2.0 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-04-06 14:04:15 +07:00
Victor Vieux f3d64cfad3 unskip and fix a few tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-04-03 00:48:07 +00:00
Chanwit Kaewkasi 458d83802f make SWARM_ROOT configurable 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-03-26 22:51:09 +07:00
Nick Huanca, Matt Bajor, Matt Knox, Fed Sawyer, Joseph Benavidez, Tom Haschenburger and Wes Morgan 366d234626 Closes #501: Error if unknown args are used in create 
Signed-off-by: Matt Bajor <matt@notevenremotelydorky.com>
 2015-03-26 02:39:33 +00:00
Victor Vieux 7945e0a482 Merge pull request #468 from vieux/ps_n_l 
add support for docker ps -l / -n
 2015-03-10 16:42:58 -07:00
Victor Vieux 33471d72d3 Merge pull request #459 from aluzzardi/integration-readme 
integration: Add README file.
 2015-03-10 11:50:29 -07:00
Victor Vieux 328b9ae13b add support for docker ps -l / -n 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-10 01:04:27 +00:00
Andrea Luzzardi 64eeb7e3c9 integration: Fix API # nodes check. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-09 15:32:14 -07:00
Andrea Luzzardi 1e2cc75c22 integration: Add README file. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-06 18:36:33 -08:00
Andrea Luzzardi 21c7d423e4 integration: Add constraints integration tests. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-06 17:39:36 -08:00
Andrea Luzzardi f9a6c1bd89 integration: stop_docker: delete volumes as well. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-06 17:20:26 -08:00
Andrea Luzzardi 9567185038 integration helpers: Fix concurrent calls to start_docker(). 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-06 16:09:06 -08:00
Andrea Luzzardi ac7fdeab6b integration: Minor bash improvements in the helpers. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-06 16:09:06 -08:00
Andrea Luzzardi 8fb3d303db integration: Add simple API test to demonstrate the helpers. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-06 11:42:43 -08:00
Andrea Luzzardi 108f4ebe06 integration: Rename vars to helpers. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-06 11:42:43 -08:00
Andrea Luzzardi b023b78e7b integration tests: Add helpers to start/stop the manager and engines. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-06 11:42:43 -08:00
Andrea Luzzardi d0b10516d6 integration: Remove manage-non-available-node test. 
It makes integration tests run really slow.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-03 17:39:55 -08:00
Andrea Luzzardi 7dc04ee694 integration: Do not verify git hash since it's set to HEAD in master. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-03 17:35:07 -08:00
Andrea Luzzardi 998cc63f78 bats: Convert encoding to utf-8 unix. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-03 17:34:42 -08:00
Andrea Luzzardi fa22dbf6a6 Integration tests: Deterministic swarm binary path resolution 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-03 17:30:07 -08:00
Chanwit Kaewkasi 046f26f1b8 add Bats integration tests 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-03-04 03:13:30 +07:00