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

926 Commits

Author SHA1 Message Date
Victor Vieux ba01634743 replace discovery.Node by discovery.Entry 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-10 01:58:43 +00:00
Victor Vieux ea2a0386ae Update ROADMAP.md 2015-02-09 11:01:23 -08:00
Victor Vieux 1c1e758ea8 Merge pull request #379 from zhangbaitong/master 
Docs:fix the problem of logic in filter section
 2015-02-07 20:56:05 -08:00
zhangbaitong 3c10270289 Docs:fix the problem of logic in filter section 
Signed-off-by: zhangbaitong <zhangbaitong@163.com>
 2015-02-07 14:35:49 +08:00
Victor Vieux 36440405f4 Merge pull request #370 from zhangbaitong/master 
Docs:fix the problem of description in strategy section
 2015-02-05 17:45:43 -08:00
zhangbaitong 67f4fbb42a docs:fix the problem of description 
Signed-off-by: zhangbaitong <zhangbaitong@163.com>
 2015-02-06 09:38:13 +08:00
Victor Vieux 4ea8159735 Merge pull request #369 from mota/fix-exec 
Fix race condition on exec
 2015-02-04 17:35:35 -08:00
Pierre Wacrenier 16f5945439 Fix race condition on exec 
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
 2015-02-05 01:40:40 +01:00
Victor Vieux e87c276c1e Merge pull request #366 from aluzzardi/tls-fix 
TLS Fixes.
 2015-02-04 14:30:17 -08:00
Andrea Luzzardi c2d7acf42a Fix --tlsverify between the CLI and Swarm. 
--tlsverify used to be effective only between Swarm and the engines, but
the authentication was not properly functioning with the CLI.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-04 13:14:05 -08:00
Andrea Luzzardi a0bfcf6733 Node: Connect with the provided address instead of resolving the IP. 
When used with `--tlsverify`, connecting with the IP forced daemon
certificates to use an IP in `subjAltName`.

Related to #341

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-04 13:10:27 -08:00
Andrea Luzzardi a48e905245 Merge pull request #358 from SvenDowideit/fix-links 
fix broken link in README
 2015-02-03 19:56:14 -08:00
Sven Dowideit f8dc6e3f73 fix 2 broken links - there's no strategy README yet, so we can't link to it in the Docker docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-04 13:04:15 +10:00
Victor Vieux 532f5d7305 Merge pull request #361 from vieux/strategy_readme 
add README.md for strategies
 2015-02-03 18:42:46 -08:00
Victor Vieux 3926582d7d add README.md for strategies 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-03 22:48:45 +00:00
Victor Vieux d03c5bb211 Merge pull request #356 from aluzzardi/dockerfile-set-host 
Dockerfile: Set swarm to bind to all interfaces in container mode.
 2015-02-02 18:49:40 -08:00
Victor Vieux 6f45238f74 Merge pull request #357 from aluzzardi/default-swarm-addr 
Change default SWARM_ADDR to the default Docker port.
 2015-02-02 18:49:29 -08:00
Andrea Luzzardi 0bf7cc8c35 Change default SWARM_ADDR to the default Docker port. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-02 18:46:29 -08:00
Andrea Luzzardi 00b14527b5 Dockerfile: Set swarm to bind to all interfaces in container mode. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-02 18:44:22 -08:00
Andrea Luzzardi 2b2114e554 Merge pull request #308 from vieux/filter_swarm_containers 
Proposal: require ps -a to show swarm containers
 2015-02-02 18:32:12 -08:00
Victor Vieux 4c9935cd32 Merge pull request #355 from aluzzardi/doc-discovery-flag-fix 
Docs: Remove now deprecated `--discovery` flags.
 2015-02-02 18:18:36 -08:00
Andrea Luzzardi 2a592974a1 Docs: Remove now deprecated `--discovery` flags. 
Fixes #351

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-02 18:12:05 -08:00
Andrea Luzzardi 9541022642 Merge pull request #354 from vieux/fix_requirement 
update swarm manage requirements again
 2015-02-02 18:11:48 -08:00
Victor Vieux fb167e9511 require ps -a to show swarm containers 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-03 02:09:45 +00:00
Andrea Luzzardi 83c67a9059 Merge pull request #353 from vieux/gitcommit 
add gitcommit to version
 2015-02-02 17:59:41 -08:00
Victor Vieux afed2abbea update swarm manage requirements again 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-03 01:57:13 +00:00
Victor Vieux e38b06fbe8 add VERSION file 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-03 01:53:01 +00:00
Andrea Luzzardi 860a3d5f6b Merge pull request #350 from vieux/add_missing_close_proxy 
add missing close in proxy
 2015-02-02 17:16:17 -08:00
Victor Vieux 7c504dc58b add gitcommit to version 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-03 01:15:00 +00:00
Andrea Luzzardi 39f12e3a5a Merge pull request #352 from vieux/add_docker_compose_files 
add some docker-compose.yml
 2015-02-02 16:52:31 -08:00
Victor Vieux c0f97419c9 add some docker-compose.yml 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-03 00:37:35 +00:00
Victor Vieux c966030832 add missing close in proxy 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-02 22:49:05 +00:00
Andrea Luzzardi 4cac8f2682 Merge pull request #348 from vieux/update_requirements 
update swarm manage requirements
 2015-02-02 13:35:18 -08:00
Andrea Luzzardi a9641bcfe9 Merge pull request #340 from vieux/go_vet 
hack code to not error on go vet
 2015-02-02 13:15:09 -08:00
Victor Vieux aaac7cbb94 update swarm manage requirements 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-02 18:34:24 +00:00
Victor Vieux 34fdc81c2e hack code to not error on go vet 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-02 18:20:41 +00:00
Victor Vieux bcc9f8b7c6 Merge pull request #343 from mota/fix-token-leak 
Force connection close with token discovery
 2015-02-02 10:18:31 -08:00
Victor Vieux 1cd422aa26 Merge pull request #345 from aluzzardi/demo-scripts 
Move contrib files into script/demo.
 2015-02-02 09:56:27 -08:00
Victor Vieux 5699ad5a15 Merge pull request #344 from aluzzardi/dockerfile-gopath-fix 
Dockerfile: Prioritize godep's workspace over GOPATH.
 2015-02-02 09:56:11 -08:00
Victor Vieux 933a1e82fb Merge pull request #254 from SvenDowideit/add-mkdocs-metadata-and-reflow-to-80-chars 
Work on userguide and get the docs ready to be consumed by the docker docs-release
 2015-02-02 09:55:42 -08:00
Andrea Luzzardi d43ad7eb9e Move contrib files into script/demo. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-01 18:41:20 -08:00
Andrea Luzzardi 6c3444a9a1 Dockerfile: Prioritize godep's workspace over GOPATH. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-01 18:39:06 -08:00
Sven Dowideit 061592d237 Started working through document 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-02-02 09:53:45 +10:00
Sven Dowideit 34373bdf5a start userguide from the README.md 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-02-02 09:53:45 +10:00
Sven Dowideit 14c4fb81cf Add docker.docker.com metadata and reflow to 80-chars for GH diffs 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-02-02 09:53:43 +10:00
Pierre Wacrenier e3bf42d5be Force connection close with token discovery 
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
 2015-02-01 05:48:30 +01:00
Victor Vieux 85fa8d4291 Merge pull request #339 from aluzzardi/dockerfile 
Dockerfile improvements.
 2015-01-30 17:45:36 -08:00
Andrea Luzzardi 3da0aaf753 Dockerfile: Expose the swarm storage directory as a volume. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-30 17:42:48 -08:00
Andrea Luzzardi a2203a92a5 Dockerfile: Statically compile the swarm binary. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-30 17:41:53 -08:00
Victor Vieux b5cef2f19f Merge pull request #329 from aluzzardi/travis-test 
Simplify travis configuration.
 2015-01-30 17:24:19 -08:00