centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-03 09:49:05 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,390 Commits 55 Branches 28 Tags
eb4df9db00ca58dca3a47f1c52d64cfa03deef35
Commit Graph

124 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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