Commit Graph

2215 Commits

Author SHA1 Message Date
Morgan Bauer f6caa46c98
Add reliance on external internet connectivity
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-09-01 15:00:30 -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 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
Xian Chaobo 225d83f866 Merge pull request #1182 from everett-toews/fix-manager-x
Fix manager-X to match code and docs
2015-09-01 15:01:08 +08: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
Everett Toews 6ba2d1144f Fix manager-X to match code and docs
Signed-off-by: Everett Toews <everett.toews@rackspace.com>
2015-08-31 12:02:11 -05:00
Xian Chaobo 29df83a349 fix tag image
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-31 07:17:30 -04:00
Alexandre Beslic 6c1c83f7a3 Cleanup state folder with local file persistence (not used anymore)
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-08-30 17:15:52 -07:00
moxiegirl 403fd19acc Merge pull request #1176 from MHBauer/machine-discovery-services
clarify discovery service information
2015-08-29 13:17:33 -07:00
Chanwit Kaewkasi 36053c113c Merge pull request #1170 from MHBauer/jenkins-badge
add jenkins badge
2015-08-29 18:09:41 +07:00
Morgan Bauer 6d8fea0664
clarify discovery service information
- specify that we need to use a discovery service
 - indicate which specific discovery service we are using for this example
 - describe the token discovery service as hosted at Docker Hub
 - link to other available discovery services in the docs

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-28 18:47:40 -07:00
moxiegirl b154ccb585 Merge pull request #1172 from MHBauer/install-directions
changes to manual swarm install
2015-08-28 10:06:48 -07:00
Morgan Bauer 7b593c0140
changes to manual swarm install
- separate the node setup steps from the manager setup steps.
 - consistency of <manager_port> in all steps

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-27 11:22:25 -07:00
Xian Chaobo 5c66f2b3a0 Merge pull request #1169 from MHBauer/run-tests
fix 'go test' invocation in CONTRIBUTING.md
2015-08-27 14:46:42 +08:00
Chanwit Kaewkasi 98eb07d1ce Merge pull request #1171 from MHBauer/update-daemon-start
update docker daemon initialization to use subcommand vs -d flag
2015-08-27 10:06:46 +07:00
Morgan Bauer 6c2f4c20c9
update docker daemon initialization to use subcommand vs -d flag
- includes note regarding deprecation of -d flag

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-26 17:18:24 -07:00
Morgan Bauer 9f8675806e
add jenkins badge
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-26 12:45:26 -07:00
Morgan Bauer 47f904f58f
fix 'go test' invocation
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-26 12:33:48 -07:00
Alexandre Beslic fc0cc899e6 Merge pull request #1162 from jimmyxian/add-support-force-remove-image
Add support force remove image
2015-08-19 20:41:58 -07: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
Xian Chaobo f5ac0c87e3 update godeps
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-19 22:02:59 -04:00
Andrea Luzzardi 7534988b6a Merge pull request #1154 from chanwit/ver-050-dev
bump version to 0.5.0-dev
2015-08-19 13:48:19 -07:00
Chanwit Kaewkasi 2fd733b11e bump version to 0.5.0-dev
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-08-16 11:01:49 -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 98178f3c41 Merge pull request #1152 from vieux/enable_better_refresh_mesos_0.23
enable better refresh with mesos 0.23
2015-08-15 15:50:41 +08:00
Chanwit Kaewkasi 918c7a0466 Merge pull request #1148 from vieux/add_container_mesos
add container name in mesos task label and update mesos-go
2015-08-14 20:53:35 -04:00
Victor Vieux 58482a13d2 enable better refresh with mesos 0.23
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-14 17:11:19 -07:00
Victor Vieux cc7b9b2176 add container name in mesos task label
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-14 13:48:49 -07:00
moxiegirl a80cb7ba34 Merge pull request #1144 from moxiegirl/final-link-check
Fixing links after check
2015-08-13 07:53:17 -07:00
Alexandre Beslic 83f93dff47 Merge pull request #1146 from jimmyxian/improve-image-all
Add support images -a
2015-08-12 11:17:52 -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
Andrea Luzzardi 11b12b81b0 Merge pull request #1141 from vieux/only_display_swarm_containers
display only containers created by swarm in mesos
2015-08-11 11:37:36 -07:00
Mary Anthony 55692c3ec0 Fixing links after check
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-11 09:56:33 -07:00
Victor Vieux d5c41a38c1 update tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-10 23:09:52 -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 2b3759cd21 Merge pull request #1139 from vieux/remove_old_release_notes
remove useless release-notes.md
2015-08-10 13:35:44 -07:00
Victor Vieux 2537f4abf9 remove useless release-notes.md
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-08-10 13:32:57 -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
Chanwit Kaewkasi 10171228e2 Merge pull request #1124 from vieux/improve_usage
improve usage for discovery
2015-08-07 20:57:33 -04: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
Andrea Luzzardi b32f0da81d Merge pull request #1127 from chanwit/natural-sort
Natural sorting for Engine names
2015-08-07 17:36:08 -07:00
Chanwit Kaewkasi d1291203a6 Merge pull request #1128 from vieux/add_chanwit
add Chanwit to the MAINTAINERS file
2015-08-07 20:31:05 -04:00
Victor Vieux 4ff1615710 Merge pull request #1134 from vlajos/typofixes-vlajos-20150807
typofix - https://github.com/vlajos/misspell_fixer
2015-08-07 16:31:21 -07:00