* Reword lots of instances of 'will'
* Reword lots of instances of won't
* Reword lots of instances of we'll
* Eradicate you'll
* Eradicate 'be able to' type of phrases
* Eradicate 'unable to' type of phrases
* Eradicate 'has / have to' type of phrases
* Eradicate 'note that' type of phrases
* Eradicate 'in order to' type of phrases
* Redirect to official Chef and Puppet docs
* Eradicate gratuitous 'please'
* Reduce use of e.g.
* Reduce use of i.e.
* Reduce use of N.B.
* Get rid of 'sexagesimal' and correct some errors
- added restart to list of sub-options not supported in stack deploy
- added note to the bottom of restart description that it isn't supported in stack deploy, and to use restart_policy instead.
* Note about setting ipv4/ipv6 not working in swarm
I spent a few hours yesterday assuming this was possible, but it turns out it isn't. Hopefully this will help prevent others from making the same mistake I did.
In this context, I think `docker container create` is more suitable and more respectful to the new syntax and better analogy with `docker network create` and `docker volume create`
* added more info about resource constraints to Compose docs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed link in Compose docs, added instructions in test for adding custom target link link IDs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed links
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Fix docker-compose file version in the example given for the new volumes "long syntax", available from version 3.2.
Currently the example contains version 3 which does not support this syntax.
Added 'rollback' to the list in the following bullet:
- `failure_action`: What to do if an update fails. One of `continue`, `rollback`, or `pause` (default: `pause`).
* Fix Compose file samples for volumes and other
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixing Compose file example, adding another volume mount example
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* replaced x-ref to volumes info with the right one
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* add bullets to note
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* corrected for description of bind mount as example intro
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* modified volumes example per developer review
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* corrected for legacy stuff on examples, clarified named volumes
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed capitalization in x-refs visible text
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* surface Compose file example at top of topic
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* removed extraneous intro
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* for all links to , changed to full path
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed link in Swarm Tutorial per review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* better examples to show Compose file structure
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* cleaned up leading spaces in Compose file example
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* cleaned up leading spaces, added a test file
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* expand/collapse accordion full implementation, explanation in test.md
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* delete temporary test file from PR
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fix accordion to work on mobile (cursor style)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* verified fix for mobile worked, added same to test.md, updated notes and content
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Clarifed details on test page, fixed references for FontAwesome icons
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added endpoint_mode topic for Compose file v3.3
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* incorporated review comments re: features and versioning
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added Compose topics on caching options for performance
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* updated title for Compose topic
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* line wrap per review
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* clarified ordering of env files
* added env_file order of precedence to v1, v2 Compose
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* formatting
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* clarified Mac vs. Linux steps on bash completion
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* copyedit on Compose file reference page
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* expanded on explanation in note re: extends supported versions
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* x-ref to open issue to bring back extends
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added more x-refs to note on extends
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Specify Compose version for Compose file formats (#3297)
* Specify Compose version for Compose file formats
Explicitly specifying Compose versions file formats 2.1 and 2.2.
* corrected typo 2.1 --> 2.2
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Document new Compose 1.14.0 features (#3695)
Signed-off-by: Joffrey F <joffrey@docker.com>
* Current compose is 1.14.0 (#3690)
Signed-off-by: Guillaume Rose <guillaume.rose@docker.com>
* Fix typo
* added links to Compose release versions, improved matrix description
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* review comments, used include for matrix in all file references
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* incorporated review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added notes and troubleshooting topic on volume mounts from host
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* updates to troubleshooting, FAQs and shared drives topics and notes
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added Anaconda Python 3.5.2 install/run to known issues
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added notes re: Python 3.x not supported in setup and install
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed heading levels in Cloud known errors
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed links (moby --> docker), formatting
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed on-page link list alignments for toc max/min topics
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added example for env_file variables
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* copyedits and rework of Compose rails example
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* clarified logging options in Compose, fixed glaring note formats
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added link directly to JSON driver in supported drivers docs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* took off code tags to make link stand out
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed alignment of note text in markdown
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* x-ref to how to set environment variables in containers
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* copyedit in note
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
There were a number of things wrong with the `restart` definition
1. The volumes note came after the restart section rather than before
2. The restart command used array notation rather than map. This is confusing to those unfamiliar with yaml and inconsistent with the rest of the documentation
3. Using `docker-compose` myself, saying `restart: no` does not work, but `restart: "no"` does.
```
ERROR: The Compose file './docker-compose.override.yml' is invalid because:
services.letsencrypt.restart contains an invalid type, it should be a string
```
* Update fedora.md
add warning class to blogquote
* Update linux-postinstall.md
add warning class to blogquote
* Update ubuntu.md
add warning class to blogquote
* Update https.md
add warning class to blogquote
* Update swarm_manager_locking.md
add warning class to blogquote
* Update dockerlinks.md
add warning class to blogquote
* Update deploying.md
add warning class to blogquote
* Update deploying.md
add warning class to blogquote
* Update insecure.md
add warning class to blogquote
* Update discovery.md
add warning class to blogquote
* Update dockerd.yaml
add warning class to blogquote
* Update docker_secret_rm.yaml
add warning class to blogquote
* Update docker_service_rm.yaml
add warning class to blogquote
* Update docker_secret_rm.yaml
add warning class to blogquote
* Update scale-your-cluster.md
add warning class to blogquote
* Update resource_constraints.md
add warning class to blogquote
* Update binaries.md
add warning class to blogquote
* Update content_trust.md
add warning class to blogquote
* Update secrets.md
add warning class to blogquote
* Update index.md
add warning class to blogquote
* Update install-sandbox-2.md
add warning class to blogquote
* Update docker-toolbox.md
add warning class to blogquote
* Update index.md
add warning class to blogquote
* Update centos.md
add warning class to blogquote
* Update debian.md
add warning class to blogquote
* Update faqs.md
add linebreak after Looking for popular FAQs on Docker for Windows?
* Update install.md
add linebreake after **Already have Docker for Windows?**
* Revert "Update dockerd.yaml"
This reverts commit 3a98eb86f700ade8941483546c33f69a9dab8ac3.
* Revert "Update docker_secret_rm.yaml"
This reverts commit 5dc1e75f37033932486c11287052b7d64bf83e55.
* Revert "Update docker_service_rm.yaml"
This reverts commit a983380a5625b471f1a03f8ed2301ead72f98f1b.
* Revert "Update docker_secret_rm.yaml"
This reverts commit 4c454b883c300e26fbb056b954bb49ec2933b172.
* update re:container_name not supported in v3 Compose
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added container_name to list of removed v3 options
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* corrected definitions per reviews
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* listed unsupported suboptions for deploy key
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Create index.md
* Create part2.md
* Create part3.md
* Create part4.md
* Create part5.md
* Rewrite step 2
* Update part2.md
* Update part2.md
* Update part2.md
* Update part2.md
* Update part2.md
* Update part2.md
* Update index.md
* Rewrite of part 3
* Tabs-based swarm instructions, pass 1
* Rewrite of parts 3 and 4, tabs implementation
* Navigation, rewrites, part 4 completion
* Part 5 w/Redis
* Part 5, compelte Redis, rename part 6
* TOC/redirect implementation
* Update part6.md
* Changing links to point to new tutorial
* Rewrites and asciinemas
* Fix overview
* Label diagrams
* Fix button
* Fix link to where Stacks are covered
* Fix typo
* s/file/directory
* Reformat paragraph
* Shorten tabs
* Typos
* Release DTR 2.2.4, 2.1.6
* Go back to small /edge (#2736)
* Go back to small /edge
* Update site front page
Add info about Editions
Reorganize components
Update headings
* Move logic of fetching content to a script
* Add v1.28 API
* Add info about versioned API
* Fix a few 404s (#2785)
* Fix typo
* Propose use of another word (#2791)
I think that interested is better than invested, in this case.
* Update secrets.md (#2780)
remove correct secret
* Change mount syntax on windows from //c/ to c:\ (#2761)
LGTM
* Update hackathon.md (#2773)
* nodes.md grammar correction (#2802)
* Grammar and formatting check (#2797)
* Wrong article
If the first word starts with a vowel sound you use an. If the first word has a consonant sound use a.
* Making the text bold
Removing backticks because probably the text needs to be bold and not marked as code.
* Update overview.md (#2805)
It should say 'predecessors', not 'successors'. Otherwise the sentence and the subsequent example don't make sense.
* shrink some big images (#2798)
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
* #2627 (#2804)
- Fix right sidebar overflow on rescale
* Update hackathon.md
* change pre-build to pre_build to remove confusion (#2813)
* change pre-build to pre_build to remove confusion
* clarify that pre_build hook refers to a file
* Update TOC to sentence case (#2790)
* add more info about DTR on the overview page (#2794)
fix#1904
* Update glossary.yaml (#2807)
Fix#2575.
* fix imports since docker api pkg migration, fix example repository name to be canonical (#2806)
* tweak: code format for filename (#2829)
* tweak: code format for filename
slight reword, so as to avoid confusion w/filename
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* small changes just to kick build again
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Update hackathon.md
* fix broken links (#2808)
* fix broken link (#2809)
* [CONTRIBUTING] update broken link (#2826)
* [Debian] add gnupg2 requirement for stretch (#2823)
* TOC/redirect implementation
* Changing links to point to new tutorial
* Rewrites and asciinemas
* Fix bad merge
* Metadata, formatting
* Front page formatting, link instrumentation
* Adds documentation about the `--ignore-override` option
For PR https://github.com/docker/compose/pull/4543
When option `--ignore-override` is provided the `docker-compose.override.yml`
file, if it exists, will not be considered for any command. This option
has no effect when the `-f` option is used as that explicitly lists the
set of files to be considered.
Signed-off-by: Dennis Gove <dpgove@gmail.com>
* Compose 1.12.0 additions (#2472)
* Add mem_reservation to list of v2 options
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add dns_opt to v2 service configuration
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add pids_limit to service configurations
Signed-off-by: Joffrey F <joffrey@docker.com>
* Update list of options for docker-compose rm
Signed-off-by: Joffrey F <joffrey@docker.com>
* Update list of options for docker-compose config
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add --exit-code-from to docker-compose up documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add --parallel to docker-compose pull reference
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add build-args to docker-compose build reference
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add --volume to docker-compose run reference
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add --project-directory to list of docker-compose options
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add reference docs for images command
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add documentation for COMPOSE_PATH_SEPARATOR
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add documentation for cache_from option
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add long form for ports.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* Remove volume_driver from v3 reference.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* Add docs for expanded mount syntax.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Compose file v1 and v2 docs had relative links to some non-existing pages (especially about extending services). It was probably introduced when `compose-file.md` was detached into directory with single file per compose file version.
copyedits, rewrite
fixed some links
simplified/shortened this topic
tweaked description of key, option, value
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
added more links re: overlay networks
provided more links to networking topics, restructured the section
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* docker swarm does not respect depends_on
Swarmkit does not seem to have the concept of starting services in a particular order.
Tested with docker 1.13.1. Also, `docker-compose bundle` warns us about depends_on being unsupported.
* Remove condition form of depends_on from the V3 compose file docs.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
copyedit to fix typo
wrapped text properly
replaced original example with Nathan's
added a better sub-title
specifically mentioned not using relative paths
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
James Gentes
rdxmb
Joffrey F
Joffrey F
Gwendolynne Barr
Björn
Jeffrey M. Levesque
Marcus Geißler
Diego Rabatone Oliveira
Misty Stanley-Jones
Steven Showers
ethan-haynes
Wadim Kruse
Bret Fisher
Daniel Nephin
Glenn O. Larsen
Emiliano 'AlberT' Gabrielli
new-guy
mouhamed
Alex Finnarn
Peter Kokot
ada
Lachlan Cooper
Laura Frank
Alexandre Rio
Dave Henderson
John Mulhausen
Godefroid Chapelle
Gilad Peleg
Victoria Bialas
Sébastien HOUZÉ
Santiago Petrone
Juan Pablo Picasso
Yong Wen Chua
Wenxuan Zhao
Alon Bar Tzlil
Brikou CARRE
Sebastiaan van Stijn
cthomas15
James Guthrie
ryota-murakami
Victoria Bialas
dark0dave
tahia
Adrian Moisey
Misty Stanley-Jones
Sequoia McDowell
zasca
Ben Reichert
John Yani
Vlad
Andy Neff
hacfi
Xianlu Bird
Daniel Maslowski
Lenny Linux
Suraj Narwade
Rubab-Syed
xufei100
Jim Galasyn
mrfly
Mateusz Kurek
Joe Meissler
Joe Meissler