docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,088 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

2088 Commits

Author SHA1 Message Date
Victor Vieux fe24dbcd1a Merge pull request #1205 from MHBauer/gh1090 
remove deprecated unused flag
 2015-09-09 17:29:42 -07:00
moxiegirl c36dd9c1df Merge pull request #1184 from ahmetalpbalkan/mesos-docs 
docs: Clarify mesos driver, also line-wrapping
 2015-09-09 17:12:24 -07:00
Morgan Bauer 5c4b0a1765
remove deprecated unused flag 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-09-09 16:22:53 -07:00
Ahmet Alp Balkan a7d8d2fcbf docs: Clarify mesos driver, also line-wrapping 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-09-09 09:54:58 -07:00
Chanwit Kaewkasi 30cfdfb12d Merge pull request #1196 from vieux/initial_volume_support 
add support for docker volume ls & inspect
 2015-09-09 09:56:39 +07:00
Victor Vieux 0579920c0d Merge pull request #1166 from chanwit/image-dedup 
Implement grouping list of images by Id
 2015-09-08 11:52:43 -07:00
Chanwit Kaewkasi 2d78f6a388 Merge pull request #1201 from abronan/fix_token_watch 
Fix token discovery Watch on failure
 2015-09-08 11:18:56 +07:00
Alexandre Beslic 3869d5eee8 Fix token discovery, error chan for Watch was not passed back to the caller 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-09-07 05:25:52 -07:00
Victor Vieux 77c96908f0 add support for docker volume ls & inspect 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-05 07:56:22 -07:00
Alexandre Beslic 6787aa8619 Merge pull request #1193 from vieux/update_discovery_url 
update discovery url
 2015-09-03 18:13:56 -07:00
Chanwit Kaewkasi 45e091bca5 implement grouping list of images by Id 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-09-04 02:15:05 +07:00
Chanwit Kaewkasi 15cc8a31d8 Merge pull request #1192 from vieux/revert_mesos_logs 
Revert "prevent double starts with mesos"
 2015-09-04 02:12:27 +07:00
Chanwit Kaewkasi 987dc06365 Merge pull request #1168 from abronan/fix_refresh 
Fix panic on Container/Image refresh after Engine removal
 2015-09-03 13:16:40 +07:00
Chanwit Kaewkasi 4cdbe875b8 Merge pull request #1155 from vieux/fix_mesos_logs 
prevent double logs with mesos
 2015-09-03 13:10:52 +07:00
Victor Vieux 6678a167fe update discovery url 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-02 21:04:04 -07:00
Victor Vieux d571b7e39e Revert "prevent double starts with mesos" 
This reverts commit 9a93dcf46b.

Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-02 20:33:49 -07:00
Victor Vieux b01167dc6a Merge pull request #1186 from MHBauer/gitignore 
fix gitignore to specifically ignore the binary called swarm in the root directory
 2015-09-02 17:09:08 -07:00
Alexandre Beslic cfa802c07f Merge pull request #1188 from vieux/switch_to_1.5 
switch to golang 1.5
 2015-09-02 11:46:58 -07:00
Alexandre Beslic a7303ecc5e Fix panic on various calls when assigning Engine client to nil 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-09-02 09:41:51 -07:00
Victor Vieux 2fb43773cf Merge pull request #1180 from abronan/clean_state 
Cleanup state folder with local file persistence
 2015-09-01 17:04:28 -07:00
Alexandre Beslic 9e6ac5cfa6 Merge pull request #1187 from vieux/add_short_live_test_mesos 
@test "mesos - docker run short lived"
 2015-09-01 16:55:41 -07:00
Victor Vieux c3d890a727 Merge pull request #1178 from MHBauer/hosted-network-connectivity 
Add reliance on external internet connectivity
 2015-09-01 16:45:23 -07:00
Morgan Bauer 966b04eaab
fix gitignore to specifically ignore the binary called swarm in the root directory 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-09-01 15:19:38 -07:00
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