Commit Graph

1334 Commits

Author SHA1 Message Date
Victor Vieux 6eceffacf9 use cluster.ContainerConfig
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-30 11:44:25 -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
Victor Vieux 24ea07f9ec Merge pull request #685 from aluzzardi/fix-integration
Fix integration test cleanup.
2015-04-28 16:52:54 -07:00
Andrea Luzzardi 246bee3b62 Merge pull request #684 from vieux/private_pull
support pulling private images from docker pull
2015-04-28 15:48:20 -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 e5f4243dad support pulling private images from docker pull
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-28 11:17:44 -07:00
Victor Vieux 7b459eb4ba Merge pull request #683 from icecrime/fail_fast_on_create
Fast exit from create on invalid command-line
2015-04-28 10:52:20 -07:00
Arnaud Porterie c3903d69f9 Fast exit from create on invalid command-line
The `create` command now fails immediately when invoked with an invalid
command-line rather than going as far as initializing discovery and
creating a cluster.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-28 09:47:06 -07:00
Victor Vieux 6b5176fd08 Merge pull request #681 from jimmyxian/fix-return-value
fix return value
2015-04-27 18:45:48 -07:00
Xian Chaobo 40a3eb1aa1 fix return value
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-27 21:35:46 -04:00
Andrea Luzzardi e08d32c7e8 Merge pull request #680 from vieux/fix_error_test
fix error message in tests
2015-04-27 14:54:06 -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
Alexandre Beslic 28918e7e0a Merge pull request #678 from vieux/fix_tests
fix syntax error in tests
2015-04-27 10:45:12 -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 74135e7bf2 Merge pull request #674 from bpradipt/fix_strategy_typo
Fix minor typo in description of 'binpack' scheduler strategy.
2015-04-27 10:27:48 -07:00
Victor Vieux dce5d6fbba add a few expr tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-27 10:10:22 -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
Victor Vieux 77f0ac919a update doc
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-27 09:51:09 -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
Pradipta Kr. Banerjee b4e692d442 Fix minor typo in description of 'binpack' scheduler strategy.
Signed-off-by: Pradipta Kr. Banerjee <bpradip@in.ibm.com>
2015-04-26 12:02:59 +05:30
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
Victor Vieux f388d700fe use label as affinity
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-23 15:43:17 -07:00
Victor Vieux 4f6df9704f update Godeps to get Labels in container
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-23 15:41:30 -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 e496d04d47 Merge pull request #665 from vieux/fix_help
fix consul help
2015-04-23 14:44:15 -07:00
Victor Vieux 57ef27efcc fix consul help
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-23 14:41:21 -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 82cb38ddb0 Update ROADMAP.md 2015-04-22 16:37:35 -07:00
Andrea Luzzardi 56f10310b8 Update ROADMAP.md 2015-04-22 16:27:11 -07: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 25fd49971b Merge pull request #656 from vieux/bump
bump version to 0.3.0
2015-04-21 15:04:57 -07:00
Victor Vieux 65285b437d bump version to 0.3.0
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-21 15:03:51 -07: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
Andrea Luzzardi e163ee9b05 Merge pull request #639 from snrism/add_node_label_to_info
Add Node Labels to Info
2015-04-21 13:54:48 -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