summaryrefslogtreecommitdiff
path: root/docs
Commit message (Collapse)AuthorAge
...
* | | | | Clarify behaviour of rm and downAanand Prasad2016-04-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | added some formatting on the Wordress steps, and made heading levels in ↵Victoria Bialas2016-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these sample app topics consistent Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* | | | | Updated Wordpress tutorialSanyam Kapoor2016-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new tutorial now uses official Wordpress Docker Image. Signed-off-by: Sanyam Kapoor <1sanyamkapoor@gmail.com>
* | | | | Merge pull request #3187 from ↵Ben Firshman2016-04-01
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bfirsh/update-wordpress-example-to-use-official-images Update wordpress example to use official images
| * | | | | Update wordpress example to use official imagesBen Firshman2016-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The orchardup images are very old and not maintained. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | | | | Better variable substitution exampleAanand Prasad2016-03-31
| |/ / / / |/| | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | Add support for DOCKER_* variables in .env fileJoffrey F2016-03-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Less verbose environment invocationJoffrey F2016-03-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Mention environment file in envvars.mdJoffrey F2016-03-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Documentation for .env fileJoffrey F2016-03-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Add TLS flags to CLI referenceAanand Prasad2016-03-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | Merge pull request #3182 from londoncalling/docs-fix-links-build-errorsVictoria2016-03-23
|\ \ \ \ \ | |/ / / / |/| | | | fixed links showing as build errors per PR #3180
| * | | | fixed links showing as build errors per PR #3180Victoria Bialas2016-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed links per build errors Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* | | | | Merge pull request #3178 from aanand/2774-off-one-offsAanand Prasad2016-03-22
|\ \ \ \ \ | |/ / / / |/| | | | Remove one-off containers in `rm` and `down`
| * | | | Add --all option to rm command - remove one-off containersJoffrey F2016-03-21
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* / | | Add support for docker run --tmpfs flag.Philip Walls2016-03-18
|/ / / | | | | | | | | | Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
* | | Remove hardcoded host from Engine install URLsAanand Prasad2016-03-17
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Update install page with link to Windows Toolbox install instructionsAanand Prasad2016-03-17
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Move ipv4_address/ipv6_address docs to reference sectionAanand Prasad2016-03-17
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Merge pull request #3102 from shin-/1477-a-modest-proposalJoffrey F2016-03-16
|\ \ \ | | | | | | | | Add flag to up/down to remove orphaned containers
| * | | Add flag to up/down to remove orphaned containersJoffrey F2016-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --remove-orphans to CLI reference docs Add --remove-orphans to bash completion file Test orphan warning and remove_orphan option in up Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Add -w or --workdir to compose run to override workdir from commandlineSimon van der Veldt2016-03-15
|/ / / | | | | | | | | | Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
* | | Merge pull request #3101 from bfirsh/less-scary-swarm-compose-docsAanand Prasad2016-03-14
|\ \ \ | | | | | | | | Better Compose in production docs
| * | | Better Compose in production docsBen Firshman2016-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Compose/Swarm integration has been working really well for users, so it seems pretty safe to remove the scary warnings about it not being ready. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | | Fix #2804: Add ipv4 and ipv6 static addressingMatt Daue2016-03-09
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | - Added ipv4_network and ipv6_network to the networks section in the service section for each configured network - Added feature documentation - Added unit tests Signed-off-by: Matt Daue <mattdaue@gmail.com>
* | | Merge pull request #3089 from ltiao/patch-1Joffrey F2016-03-09
|\ \ \ | |/ / |/| | Fixed indentation level in example.
| * | Fixed indentation level in example.Louis Tiao2016-03-08
| |/ | | | | | | Signed-off-by: Louis Tiao <louistiao@gmail.com>
* / Fix version in docs exampleAanand Prasad2016-03-08
|/ | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Support multiple files in COMPOSE_FILE env var.Daniel Nephin2016-03-02
| | | | Signed-off-by: Daniel Nephin <dnephin@docker.com>
* Merge pull request #2601 from dnephin/dont_build_on_upAanand Prasad2016-03-02
|\ | | | | Only build as part of `up` if `--build` flag is set
| * Update reference docs for the new flag.Daniel Nephin2016-03-02
| | | | | | | | Signed-off-by: Daniel Nephin <dnephin@docker.com>
* | Merge pull request #3049 from aanand/clarify-depends-onAanand Prasad2016-03-02
|\ \ | |/ |/| Clarify depends_on logic
| * Clarify depends_on logicAanand Prasad2016-03-02
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #2720 from seguins/2227-improvements-logsAanand Prasad2016-03-01
|\ \ | |/ |/| Add flags on logs
| * Add --tail flag as option on logs.Stéphane Seguin2016-03-01
| | | | | | | | | | Closes #265 Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
| * Add -t, --timestamps flag as option on logs.Stéphane Seguin2016-03-01
| | | | | | | | Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
| * Add -f, --follow flag as option on logs.Stéphane Seguin2016-03-01
| | | | | | | | | | Closes #2187 Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
* | Merge pull request #3023 from londoncalling/fix-note-3019Aanand Prasad2016-03-01
|\ \ | | | | | | WIP: updated note format for dockerfile per Aanand's comments on PR #…
| * | WIP: updated note format for dockerfile per Aanand's comments on PR #3019Victoria Bialas2016-02-25
| | | | | | | | | | | | Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* | | Merge pull request #2584 from mjgpy3/patch-1Aanand Prasad2016-02-29
|\ \ \ | | | | | | | | Update `volumes_from` docs to state default
| * | | Update `volumes_from` docs to state defaultMichael Gilliland2015-12-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Proof of read-write](https://github.com/docker/compose/blob/cfb1b37da22242dc67d5123772b3fa4518458504/compose/config/types.py#L26). I found myself wondering what the default was a couple of times, and finally decided to change it :) Signed-off-by: Michael Gilliland <gillilandmj@upmc.edu>
* | | | Merge pull request #3024 from aanand/update-build-image-docsDaniel Nephin2016-02-29
|\ \ \ \ | | | | | | | | | | Update docs about using build and image together
| * | | | Update docs about using build and image togetherAanand Prasad2016-02-25
| | |/ / | |/| | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | Merge pull request #3022 from aanand/update-build-image-extends-noteDaniel Nephin2016-02-29
|\ \ \ \ | | | | | | | | | | Update note about build + image with extends
| * | | | Update note about build + image with extendsAanand Prasad2016-02-25
| |/ / / | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | Merge pull request #3030 from aanand/document-startup-order-workaroundsDaniel Nephin2016-02-29
|\ \ \ \ | | | | | | | | | | Document ways to make services wait for dependencies
| * | | | Document ways to make services wait for dependenciesAanand Prasad2016-02-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | | | Update FAQ regarding long stop timesAanand Prasad2016-02-26
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* / | | implement execTomas Tomecek2016-02-29
|/ / / | | | | | | | | | | | | | | | Resolves #593 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* / / Add release notes for 1.6.2Aanand Prasad2016-02-25
|/ / | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>