0b3561a7d5
Merge pull request #2720 from seguins/2227-improvements-logs
...
Add flags on logs
2016-03-01 17:41:31 -08:00
9b36dc5c54
Add --tail flag as option on logs.
...
Closes #265
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:46 +01:00
d9b4286f91
Add -t, --timestamps flag as option on logs.
...
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:46 +01:00
82632098a3
Add -f, --follow flag as option on logs.
...
Closes #2187
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:43 +01:00
7684604830
Merge pull request #3023 from londoncalling/fix-note-3019
...
WIP: updated note format for dockerfile per Aanand's comments on PR #…
2016-03-01 11:11:55 -08:00
fc99c7ee19
Merge pull request #2584 from mjgpy3/patch-1
...
Update `volumes_from` docs to state default
2016-02-29 15:37:46 -08:00
f5ce31d43e
Merge pull request #3024 from aanand/update-build-image-docs
...
Update docs about using build and image together
2016-02-29 14:03:54 -08:00
4db1fef58c
Merge pull request #3022 from aanand/update-build-image-extends-note
...
Update note about build + image with extends
2016-02-29 14:03:28 -08:00
8d24af92e0
Merge pull request #3030 from aanand/document-startup-order-workarounds
...
Document ways to make services wait for dependencies
2016-02-29 13:01:32 -08:00
6b947ee478
Document ways to make services wait for dependencies
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-29 11:24:58 -08:00
d28c5dda92
implement exec
...
Resolves #593
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-02-29 10:50:09 +01:00
62fb6b99eb
Update FAQ regarding long stop times
...
- It happens on recreate, not just stop
- We now support `stop_signal`, which can help in some cases
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-26 14:34:44 -08:00
c72e9b3843
Add release notes for 1.6.2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-25 17:55:04 -08:00
5be48ba1ed
Update docs about using build and image together
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-25 17:19:58 -08:00
5cc420e727
WIP: updated note format for dockerfile per Aanand's comments on PR #3019
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-25 16:47:46 -08:00
2cd1b94dd3
Update note about build + image with extends
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-25 15:15:18 -08:00
49ef8a271d
Add release notes for 1.6.1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-23 15:13:01 -08:00
e6797e1166
updated Wordpress example to be easier to follow, added/updated images
...
docs update per Mary's comments on the PR
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-23 11:59:19 -08:00
176b966486
Update documentation for volume_driver option.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-22 16:51:33 -08:00
c7ceacfeae
Merge pull request #2948 from dnephin/validate_top_level
...
Validate that each section of the config is a mapping
2016-02-19 13:41:50 -05:00
bed0cfeb32
Merge pull request #2807 from aanand/swarm-doc
...
Update Swarm integration guide and make it an official part of the docs
2016-02-19 10:25:28 -08:00
0d218c34c7
Make config validation error messages more consistent.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-19 13:12:57 -05:00
520c695bf4
Update Swarm integration guide and make it an official part of the docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-19 09:32:43 -08:00
eb4a98c0d1
corrected description of network aliases, added real-world example per #2907
...
copyedit to make show as file format
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-18 18:05:52 -08:00
7152f7ea76
Handle mismatched network formats in config files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:24:41 -08:00
825a0941f0
Network aliases are now part of the network dictionary
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:47 -08:00
7801cfc5d1
Document network_aliases config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:47 -08:00
471264239f
Update guides to use v2 config format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-16 16:43:26 -05:00
4de12ad7a1
Update link to docker volume create docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-16 16:43:22 -05:00
8af0a0f85b
update to description of files generated from examples, which are no longer owned by root w/new release
...
updated descriptions of changing file ownership and images per Seb's comments
fixed line wraps
fixed line breaks per Joffrey's comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-16 11:34:59 -08:00
b8c35e1298
Merge pull request #2884 from moxiegirl/remove-tutorials
...
Updating Dockerfile
2016-02-16 08:09:49 -08:00
7bae4cdbb2
Merge pull request #2875 from aanand/fix-version-in-install-guide
...
Fix version in install guide
2016-02-11 12:43:51 -05:00
b8f7bbb84e
Merge pull request #2830 from nubs/master
...
Add support for shm_size. Fixes #2823 .
2016-02-11 17:34:44 +00:00
643166ae98
Updating Dockerfile
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-10 20:47:15 -08:00
ac14642d94
Typo fixed
...
Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
2016-02-10 19:00:17 -05:00
5e6dc3521c
Add support for shm_size. Fixes #2823 .
...
shm_size controls the size of /dev/shm in the container and requires
Docker 1.10 or newer (API version 1.22). This requires docker-py 1.8.0
(docker/docker-py#923 ).
Similar to fields like `mem_limit`, `shm_size` may be specified as
either an integer or a string (e.g., `64M`).
Updating docker-py to the master branch in order to get the unreleased
dependency on `shm_size` there in place.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-10 15:25:18 -06:00
c43b25b0cf
Merge pull request #2827 from loic/patch-1
...
Fixed typo in compose-file.md
2016-02-10 15:58:54 +00:00
ab6e07da7d
Fix version in install guide
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-10 15:56:50 +00:00
59a2920758
Typo into the doc with `networks` in yaml
...
Signed-off-by: Yohan Graterol <yohangraterol92@gmail.com>
2016-02-09 18:45:04 -05:00
b635647105
Fixed typo in compose-file.md
...
Signed-off-by: Loïc Bistuer <loic.bistuer@gmail.com>
2016-02-05 09:50:22 +07:00
869e815213
Bump 1.7.0dev
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 23:46:41 +00:00
422ff623b4
Merge pull request #2819 from bfirsh/improve-names-in-compose-file-2-example
...
Improve names in Compose file 2 example
2016-02-04 19:42:22 +00:00
a7c2987991
Update docs for version being a string.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 12:19:43 -05:00
bdddbe3a73
Improve names in Compose file 2 example
...
Just makes it a bit clearer what's going on.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-02-03 17:42:57 -08:00
f612bc98d9
Fix example formatting for depends_on.
...
Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block.
I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file. It resets the markdown indentation in a way that works.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-03 14:36:46 -06:00
a713447e0b
Fixing duplicate identifiers
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-02 12:04:13 -08:00
4c4e94bc19
Merge pull request #2785 from dnephin/depends_on_with_extends
...
Fix list options when used with extends and multiple files
2016-02-02 13:36:46 -05:00
3ec87adccc
Update merge docs with depends_on, and correction about how links and volumes_from are merged.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:49:43 -05:00
7b03de7d01
Move command reference to overview.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:52 -05:00
cf24c36c55
Rename the old environment variable page to link environment variables.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:29 -05:00
2df5593e8f
Cleanup command-line reference docs by renaming overview to envvars.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:28 -05:00
5e30f089e3
Use the same capitalization for all menu items in the docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:28 -05:00
4f92004d9a
Re-order compose docs so that quickstart guides come before other documentation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:28 -05:00
3fc72038c5
New navigation for 1.10 release
...
Updating with Joffrey's comments
Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-27 12:05:56 -08:00
8c250e220c
Merge pull request #2754 from aanand/upgrading-improvements
...
Improvements to upgrade guide and script
2016-01-27 13:48:23 +00:00
d3a1cea170
Remove outdated warnings about links from docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-27 02:34:59 +00:00
650b0cec38
Remove ability to join bridge network + user-defined networks
...
Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-27 00:42:09 +00:00
b84da7c78b
Fix trailing whitespace in docker-compose.md
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 23:22:21 +00:00
bacc2b730e
Merge pull request #2748 from schmunk42/master
...
fixed documentation about traversing yml files
2016-01-26 17:20:40 +00:00
c39d5a3f06
Add note about named volumes to upgrade guide
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 15:51:09 +00:00
e566a4dc1c
Implement network_mode in v2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-25 23:24:55 +00:00
5fe0b57e5c
fixed documentation about traversing yml files
...
Signed-off-by: Tobias Munk <schmunk@usrbin.de>
2016-01-25 19:33:39 +01:00
3a72edb906
Network fields schema validation
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-01-22 16:42:10 +02:00
963ec1ceda
Merge pull request #2707 from dnephin/add_stop_signal_to_docs
...
Add stop signal to the docs
2016-01-21 18:41:28 -05:00
fec8cc9f80
Update documentation for `external` param
...
Signed-off-by: Joffrey F <joffrey@docker.com>
Conflicts:
docs/compose-file.md
2016-01-21 18:51:28 +00:00
59493dd7aa
Add links to networks key references
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:51:28 +00:00
2f41f3aa7e
Update documentation for links
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:51:28 +00:00
9a3378930f
Document depends_on
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:50:44 +00:00
0554c6e6fd
Update Compose file documentation for version 2
...
- Explain each version in its own section
- Explain how to upgrade from version 1 to 2
- Note which keys are restricted to particular versions
- A few corrections to the docs for version-specific keys
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:50:44 +00:00
3b1a0e6fc9
Add stop signal to the docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-19 21:33:04 -05:00
6b105a6e92
Update networking docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 18:45:29 +00:00
1ae57d92d4
Remove duplicate functions
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-14 14:39:06 -08:00
9cfa71ceee
Add support for build arguments
...
Allows 'build' configuration option to be specified as an
object and adds support for build args.
Signed-off-by: Garrett Heel <garrettheel@gmail.com>
2016-01-14 12:14:56 -08:00
77b4ebc31f
Merge pull request #2591 from moxiegirl/remove-todo
...
Fixing TODO visible in docs
2016-01-14 15:06:38 -05:00
c64af0a459
Add an acceptance test and docs for the down subcommand
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 11:11:08 -05:00
9bff308251
Document Entrypoints and Commands as Lists
...
Signed-off-by: Michael A. Smith <msmith3@ebay.com>
2016-01-13 17:47:30 -05:00
bf48a781db
Add flag for stops all containers if any container was stopped.
...
Signed-off-by: Evgeniy Dobrohvalov <scipetr@gmail.com>
2016-01-13 13:12:09 +03:00
ad8faad296
Merge pull request #2579 from vdemeester/update-reference-with-config-and-create
...
Add config and create to docs/reference
2016-01-12 15:16:45 -08:00
52e50a9d9a
Merge pull request #2626 from shin-/dbonev-2503-move-logging-config-under-separate-key
...
Move logging config under separate key in v2 compose files
2016-01-12 15:21:10 +00:00
063a25ae7d
Merge pull request #2392 from dnephin/docker_compose_events
...
docker-compose events
2016-01-12 11:45:27 +00:00
2f8cb55412
Merge pull request #2571 from vdemeester/fix-unpause-typo
...
Fix typo in unpause reference doc
2016-01-09 12:31:21 -05:00
37d41f22c6
Merge pull request #2572 from vdemeester/fix-run-missing-flag
...
Add missing --name flag to run reference doc
2016-01-09 12:30:57 -05:00
d1d3969661
Add docker-compose event
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-08 13:43:30 -05:00
ed5f7bd394
log_driver and log_opt moved to logging key.
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-01-08 01:54:45 +02:00
0bca8d9cb3
Add config and create to docs/reference
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-06 21:28:52 +01:00
4e75ed4231
Add missing --name flag to run reference doc
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-06 21:15:11 +01:00
77d2aae72d
Fix typo in unpause reference doc
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-06 21:14:30 +01:00
b253efd8a7
Update docs to define and document new compose.yml file format
...
Add volume configuration reference section.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-05 15:09:39 -08:00
d4e913e42c
Fixing TODO visible in docs
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-12-31 19:04:38 -08:00
39af6b653b
Update `volumes_from` docs to state default
...
[Proof of read-write](cfb1b37da2/compose/config/types.py (L26)
2015-12-28 16:44:31 -05:00
5ed559fa0e
Update links
...
Updates some links to their new locations, and
replaces some http:// with https:// links.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-21 01:52:54 +01:00
12a08255b5
Merge pull request #2554 from aanand/clarify-rm-behaviour
...
Clarify behaviour of 'rm'
2015-12-18 16:42:05 +00:00
2e9a49b4eb
Clarify behaviour of 'rm'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-12-17 17:50:45 +00:00
a542041264
Added support for cpu_quota flag
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2015-12-16 21:25:30 +02:00
dc39b01e00
Merge pull request #2512 from albers/completion-url
...
Use more robust download URL for completions
2015-12-08 16:27:09 +00:00
ecf2dd11f9
Merge pull request #2467 from dnephin/remove_migrate_to_labels
...
Remove migrate-to-labels.
2015-12-07 14:31:23 +00:00
2525752a05
Use more robust download URL for completions
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-07 09:10:19 +01:00
de4a18ea6c
Cherry-pick release notes for 1.5.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-04 10:26:20 -08:00
3f39ffe72e
FAQ document for Compose
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 10:47:32 -08:00
0eba234c54
Merge pull request #2461 from SvenDowideit/move-to-docs-base-latest
...
Use FROM docs/base:latest again
2015-12-01 08:54:13 -08:00
Aanand Prasad
Stéphane Seguin
Daniel Nephin
Tomas Tomecek
Victoria Bialas
Daniel Nephin
Joffrey F
moxiegirl
Manuel Kaufmann
Spencer Rinehart
Yohan Graterol
Loïc Bistuer
Ben Firshman
Tobias Munk
Dimitar Bonev
Garrett Heel
Michael A. Smith
Evgeniy Dobrohvalov
Joffrey F
Vincent Demeester
Michael Gilliland
Sebastiaan van Stijn
Harald Albers