moxiegirl
49f55b273b
Merge pull request #17658 from moxiegirl/incorporate-madhu-comments
...
Updating networking docs with technical information
2015-11-03 08:44:07 -08:00
Madhu Venugopal
39dfc536d4
Updating networking docs with technical information
...
- the /etc/hosts read caveat due to dynamic update
- information about docker_gwbridge
- Carries and closes #17654
- Updating with last change by Madhu
- Updating with the IPAM api 1.22
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-03 08:42:40 -08:00
Daniel Nephin
83714fbac2
Touch up intro paragraph with feedback from @moxiegirl.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:33:23 -05:00
Daniel Nephin
413921a287
Add another feature to the docs - multiple environments per host.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:33:23 -05:00
Daniel Nephin
7ee36829ac
Update intro docs based on feedback.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:33:23 -05:00
Daniel Nephin
bfb46b37d3
Updates to gettingstarted guide from PR feedback.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:33:23 -05:00
Daniel Nephin
09d2bdbb21
Flush out features and use cases.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:33:23 -05:00
Daniel Nephin
8733d09a9c
Extract the getting started guide from the index page.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:33:23 -05:00
Daniel Nephin
e524cce222
Add missing title to compose file reference.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:33:23 -05:00
Daniel Nephin
8bdde9a731
Replace composition with Compose app.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:28:51 -05:00
Daniel Nephin
eab265befa
Document using multiple Compose files use cases.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:28:51 -05:00
Daniel Nephin
c5cf5cfad4
Changes to production.md for working with multiple Compose files.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:28:51 -05:00
Daniel Nephin
1c4c7ccfac
Support a volume to the docs directory and add --watch, so docs can be refreshed.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:28:51 -05:00
Daniel Nephin
7014cabb04
Remove duplication from extends docs.
...
Start restructuring extends docs in preparation for adding documentation about using multiple compose files.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 11:28:51 -05:00
David Calavera
8d5695470a
Merge pull request #17629 from tonistiigi/kill-autorestart-fix
...
Fix race causing autorestart turning off on restart
2015-11-03 08:24:11 -08:00
Aanand Prasad
767a13f771
Merge pull request #2165 from dnephin/more_user_docs
...
Restructure intro docs
2015-11-03 16:22:28 +00:00
Sylvain Baubeau
3ff8af326b
Ensure read after write for segments
...
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com >
2015-11-03 17:09:52 +01:00
Sylvain Baubeau
0737bb7175
Update Swift bindings
...
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com >
2015-11-03 17:09:52 +01:00
Daniel Nephin
3d9e3d0877
Remove service.start_container()
...
It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-03 10:17:09 -05:00
Sebastiaan van Stijn
43ae13742d
Merge pull request #17650 from thaJeztah/fix-api-network-output
...
docs: update remote API responses and minor fixes
2015-11-03 16:09:01 +01:00
Aanand Prasad
19a41997c2
Merge pull request #2306 from dnephin/cli_tests_use_cli
...
Update cli test suite to run the executable in a child process
2015-11-03 15:05:47 +00:00
Sebastiaan van Stijn
d3b2e7dcf4
Merge pull request #17652 from moxiegirl/nigel-credits
...
Nigel acknowledgement
2015-11-03 15:35:53 +01:00
Sebastiaan van Stijn
286fe69d53
docs: update remote API responses and minor fixes
...
Add back the "old" networksettings fields that were removed,
but added back to maintain backward compatibility, in
https://github.com/docker/docker/pull/17538
Update network endpoint responses, with updated response
introduced in;
https://github.com/docker/docker/pull/17536
Added changes to v1.22 that were applied to the v1.21 / v1.20 docs
after the API bump(s);
https://github.com/docker/docker/pull/17085
https://github.com/docker/docker/pull/17127
https://github.com/docker/docker/pull/13707
Also fixed some mixed tab/spaces indentation
and Markdown formatting issues (causing code-blocks to
be rendered incorrectly)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-11-03 15:24:31 +01:00
Mary Anthony
7b978cc378
Nigel acknowledgement
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-03 05:52:33 -08:00
Sebastiaan van Stijn
43ad218293
Merge pull request #17651 from moxiegirl/nathans-tweaks
...
Fixing ZooKeeper and some other nits Nathan found
2015-11-03 14:40:11 +01:00
Mary Anthony
0f1083c8da
Fixing ZooKeeper and some other nits Nathan found
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-03 05:34:54 -08:00
Mary Anthony
a27fb2ff0d
Updating per Betty's verbal comments.
...
Entering Betty's second round comment
Fix awkward code blips
Merging JChu's comments from outdated material
Fixing problems in Dockerfile
pdating with the comments from John
Updating for DTR
Updating for fix
Updating with the comments from Betty and Jon
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-03 04:58:26 -08:00
Sebastiaan van Stijn
578f4e129e
Merge pull request #17242 from jlebon/pr/makefile-no-tty
...
Makefile: don't allocate pseudo-tty if not interactive
2015-11-03 13:10:31 +01:00
rsmoorthy
4d9b8bae25
multiple mount/unmount req with same volume name
...
Updating docs to handle mount/unmount requests with same volume name. Issue #17585
Signed-off-by: Moorthy RS <rsmoorthy@gmail.com >
2015-11-03 16:33:20 +05:30
Kun Zhang
8845259f49
update docker_cli_help_test.go
...
Signed-off-by: Kun Zhang <zkazure@gmail.com >
2015-11-03 18:24:47 +08:00
kayrus
0a6acbede3
Updated vendor go-systemd with enabled TLS activation
...
Signed-off-by: kayrus <kay.diam@gmail.com >
2015-11-03 11:02:05 +01:00
Sylvain Baubeau
7c3281861f
Add support for temporary URL for Swift driver
...
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com >
2015-11-03 09:59:50 +01:00
Sylvain Baubeau
7759153f2f
Update Swift bindings
...
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com >
2015-11-03 09:57:39 +01:00
Victor Vieux
087e2452f3
Merge pull request #1369 from vieux/fix_various_issues
...
Fix various issues
2015-11-03 00:35:11 -08:00
Ying Li
2d8ebb9d4a
Merge pull request #264 from jfrazelle/fix-makefile
...
Fix version in makefile
2015-11-02 22:41:32 -08:00
Jeffrey Morgan
e533ed35d2
Merge pull request #1170 from kitematic/remove-escape
...
Don't escape volume paths
2015-11-02 22:30:43 -08:00
Gou Rao
0385b9b65d
Update plugins.md
...
Add OpenStorage to Docker plugin list.
Signed-off-by: Gou Rao <gou@portworx.com >
2015-11-02 22:23:13 -08:00
Jeffrey Morgan
38ca2bef8d
Don't escape volume paths
2015-11-02 22:22:23 -08:00
Nathan LeClaire
bccbe19a86
Merge pull request #2146 from nathanleclaire/rm_automatic_cert_regeneration
...
Remove automatic certificate regeneration
2015-11-02 22:14:22 -08:00
Nathan LeClaire
f3122dd853
Merge pull request #2099 from nathanleclaire/help_foobar
...
Smooth rough edges around create help text
2015-11-02 22:14:06 -08:00
moxiegirl
05a4cb2221
Merge pull request #17486 from moxiegirl/16286-storage-drivers
...
Improved Storage Driver Documentation
2015-11-02 21:42:03 -08:00
Mary Anthony
950fbf99b1
Add special memory management file
...
updating after assignment for Nigel
Adding in some notes from Nigel work
Updating with the storage driver content Nigel added
Updating with Nigel's polishing tech
Adding in Nigel graphics
First pass of aufs material
Capturing Nigel's latest
Comments back to Nigel on devicemapper
Incorporating Nigel's comments v3
Converting images for dm
Entering comments into aufs page
Adding the btfs storage driver
Moving to userguide
Adding in two new driver articles from Nigel
Optimized images
Updating with comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-02 21:40:18 -08:00
Jeffrey Morgan
b3129844dd
Merge pull request #1169 from kitematic/better-reports
...
Better docker-machine error reports
2015-11-02 21:22:52 -08:00
moxiegirl
43077f9b64
Merge pull request #17340 from moxiegirl/new-networking-docs
...
Network docs for release
2015-11-02 21:16:41 -08:00
Jeffrey Morgan
f9c9d94a1c
Merge branch 'master' into better-reports
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-11-02 21:15:48 -08:00
Mary Anthony
9ef855f9e5
First pass at consolidating
...
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-02 21:14:55 -08:00
Alexander Morozov
3c695d7ed7
Merge pull request #17634 from stevvooe/avoid-panic-on-flush
...
Avoid panic on write after close in http
2015-11-02 21:11:52 -08:00
Jeffrey Morgan
7b7f1d3870
Better error reports around docker-machine
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-11-02 19:57:15 -08:00
Jeffrey Morgan
5426eeaafd
Better error & retry tracking in Kitematic
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-11-02 19:37:42 -08:00
Nathan LeClaire
f5b6c87e7c
Remove automatic certificate regeneration
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-02 19:31:29 -08:00