After running "docker-compose up", the console shows a nice aggregated output of each container. When running this in detached mode, it's not clear how to later view this aggregated output again. Added a quick note on how this is done.
* 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 download urls for compose command completion
Signed-off-by: Harald Albers <github@albersweb.de>
* Use sudo when installing bash completion
Writing to the system-wide completion plugin directory `/etc/bash_completion.d/`
requires root permissions.
Signed-off-by: Harald Albers <github@albersweb.de>
* updates to version variables for compose and machine
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* copyedit to make Compose release version number correct
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* re-org sample to show static loaded image, then using a volume mounte
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* review comments from mstanleyjones and joaofnfernandes
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added a sub-step to make the workflow and output make sense
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* combined notes about shared drives and volumes, reorganized topic order
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.
* re-organized Compose install docs into tabs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* combined d4win and windows server on one tab
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed tabs alignment
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed heading levels to show properly in TOC
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixing tabs and content
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* removed cruft test content from tabs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* final version of tabs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Set toc_max to get headings within tabs out of on-page toc
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added a subtle <hr> under tab topics per review request
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* put back missing Compose Wordpress example
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* addressed review comments, postponing one comment re: yaml code fencing
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
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>
* clarify Compose install prerequisites
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* organized install on Microsoft Server into steps
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* better highlighting and organization for the desktop systems section
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* copyedit for consistency
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* changed Docker server --> Docker per review
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* attempt to clarify Compose / Docker Engine dependencies per reviews
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* copyedits per reviews
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>
* added better links to Compose overview docs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed drupal samples link per feedback
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>
* Remove documentation about the `--ignore-override` option
* changed link to full path, copyedit
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
Without the host and credentials, the `myapp_test` database is not
created, and instead, the user receives a PG error and a long backtrace.
This commit moves the credentials to a default anchor to share across
development and test environments.
* 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>
* updated/improved Compose samples
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* linked some more basic docker-compose commands
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* coypedit
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* improve Compose rails sample
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* updated file list and commands based on feedback for no skip-bundle
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added, start, stop, rebuild info to Rails sample
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* updated info re: default Flask port for compose get started
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* more changes for rebuilding steps
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added rebuild info
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added info about Gemfile.lock to rebuild steps
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>
* update Compose release link, clarified download pattern
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added more version admonitions for Linux and containers, improved notes
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added site-wide variable for Compose version, review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* docs change for compose/networking
Without this clarification, I was tripped up for a while because it wasn't easy to understand why containers were getting connection refused errors on ports defined for the host, not the container.
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>
* Fix manager and worker join tokens. Issue #2088.
Fix screenshots per issue #2126
Move vote images to correct dir
Fix rendering issue with inline code snippet #1990
Fix for stack yaml reference (#1476)
Fix image link
Add shutdown procedures for #1017
* Make the fix asked in the PR
Little fix
* Fix missing database user for Wordpress service
It defaults to root if not specified. https://hub.docker.com/_/wordpress/
* Change root password to avoid confusion.
* 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
Adding Docker Compose sample for getting started with an ASP.NET Core
web application running SQL Server on Linux in the backend. This sample
can be used in Docker for Linux, Windows and Mac using Docker-Engine.
Note: This sample doesn't use Windows Containers.