centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-01 16:58:54 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,440 Commits 55 Branches 28 Tags
eeeba78a7f0ae200cb758aa3f0681ec00b4dd88b
Commit Graph

1440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrea Luzzardi
eeeba78a7f Merge pull request #746 from vieux/speedup_travis 
do not check dco in travis
 2015-05-07 16:16:54 -07:00
Victor Vieux
a3a2fbe628 do not check dco in travis 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-07 16:13:56 -07:00
Andrea Luzzardi
1bca3fb483 Merge pull request #744 from aluzzardi/ps-filters 
container: Use state strings from dockerclient instead of embedding them
 2015-05-07 15:50:17 -07:00
Andrea Luzzardi
5ee115fcd5 container: Use state strings from dockerclient instead of embedding 
them.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-07 15:42:26 -07:00
Andrea Luzzardi
4f1c9597d8 godeps: Update dockerclient. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-07 15:42:26 -07:00
Alexandre Beslic
0317189ef2 Merge pull request #738 from aluzzardi/ps-filters 
docker ps: Support for filters and improve state management.
 2015-05-07 15:37:59 -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
8a00a5ff10 engine: Force full refresh when container changes state. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 23:38:32 -07:00
Andrea Luzzardi
4cf0a32e4d container: Add Status() and StateString() formatters. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 23:38:32 -07:00
Andrea Luzzardi
c9199cef5a godep: update docker/docker/pkg 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 23:38:32 -07:00
Andrea Luzzardi
1a82c9ce7d godep: update dockerclient. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 22:52:30 -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
0cc5d18e54 Merge pull request #730 from aluzzardi/integration-performance 
Integration performance
 2015-05-06 16:12:47 -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
cfd93a3ae7 Merge pull request #727 from aluzzardi/api-integration-split 
integration: API tests split
 2015-05-06 00:38:17 -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
9d3dd85cf1 fix master 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 00:16:05 -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
Victor Vieux
cf0098ae40 Merge pull request #691 from aluzzardi/container-config 
Embed ContainerConfig into Container
 2015-05-05 23:51:18 -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
9124f3a0c7 cluster: Improved discovery duplication error messaging. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 19:13:57 -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
Andrea Luzzardi
34afafa3bf Merge pull request #723 from vieux/reenable_deps 
do not use inspect -f in tests
 2015-05-05 17:46:06 -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
Andrea Luzzardi
2a3a32274b Merge pull request #716 from aluzzardi/integration-cli 
integration: Run tests with Docker master
 2015-05-05 14:09:40 -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
Xian Chaobo
28043dfd7d check status code in exec 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 04:45:29 -04:00