Commit Graph

1311 Commits

Author SHA1 Message Date
Victoria Bialas 52644895c0 added suggested new example to the include
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-27 11:09:03 -07:00
dark0dave a97df05f5b Update compose-file-v2.md 2017-07-27 11:09:03 -07:00
dark0dave be2dcf2909 Update compose-file-v2.md
Missing Documentation
2017-07-27 11:09:03 -07:00
Joffrey F 181a0c6346 Compose 1.15.0 additions (#3950)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 16:08:44 -07:00
tahia d0f6397a9e 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>
2017-07-26 16:08:44 -07:00
Victoria Bialas 3558712894 added endpoint_mode topic for Compose file v3.3 (#3982)
* 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>
2017-07-26 10:33:46 -07:00
Victoria Bialas 1c6ff26042 added Compose topics on caching options for performance (#3932)
* 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>
2017-07-21 15:52:41 -04:00
Jacek Szubert c070ffe880 Remove documentation about the `--ignore-override` option (#3865)
* Remove documentation about the `--ignore-override` option

* changed link to full path, copyedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-12 13:14:50 -07:00
Misty Stanley-Jones 0c7d3b5f4c Deprecate some Dockerize topics in favor of library ones (#3735) 2017-07-12 12:06:07 -07:00
Adrian Moisey 39dd81ec91 Fix example of "configs" (#3807)
This should be "configs" not "secrets" as it's an example of the new "configs" option.
2017-07-05 16:45:55 -07:00
Victoria Bialas c2bd959d1f env file list precedence Compose file (additional clarification) (#3822)
* 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>
2017-07-05 13:43:42 -07:00
Victoria Bialas d2b71ad555 clarified Mac vs. Linux steps on bash completion (#3800)
* 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>
2017-07-03 16:26:54 -07:00
Misty Stanley-Jones 22e10b99f1 Fix Docker EE Windows links (#3789) 2017-07-03 12:15:28 -07:00
Victoria Bialas 88bb7acbd5 expanded on explanation in note re: extends supported versions (#3696)
* 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>
2017-06-29 11:57:03 -07:00
Misty Stanley-Jones 17e1da077b Tighten up base image and parent image terminology (#3720) 2017-06-28 11:56:41 -07:00
Misty Stanley-Jones 08f830811d Add configs to compose file reference 2017-06-28 08:31:29 -07:00
Misty Stanley-Jones b1aa298c16 Docs for Compose 1.14 (#3697)
* 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
2017-06-23 18:15:01 -07:00
Jon-Michael Deldin 8cd94d3873 Fix test DB creation in Compose's database.yml (#3123)
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.
2017-06-20 13:55:06 -07:00
mtilson f0a851beb1 Update completion.md (#3652) 2017-06-20 13:49:22 -07:00
Sequoia McDowell 744e5eeec8 Fixing documentation for v2 `links` (#3641)
wrapping array values in quotes is required.
2017-06-20 11:12:57 -07:00
Victoria Bialas d1ff1576cb Machine bash completion (#3624)
* corrected command completion URLs compose, machine plus cloud updates

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added notes re: Cloud on Machine cloud topics

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added notes and links re: legacy Machine swarm v. swarm mode

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit, used better punctuation

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-15 16:38:27 -07:00
Lucile df8c9c3e76 Add bash information about return codes. (#3547)
* Add bash information about return codes.

* Update shell return values after shin-'s comment
2017-06-14 09:55:59 -07:00
Franz Josef Kaiser f02c1003c2 Explain precedence of environment variables (#3496) 2017-06-13 11:50:48 -07:00
Emiliano 'AlberT' Gabrielli cd3bd1dccd Clarify on quotation marks (#3503)
Spent a lot trying to issue why Mysql password was not set in the container .. it was caused by having quoted it!
2017-06-13 11:49:41 -07:00
Victoria Bialas 5522090c0f surfaced -f, -p options on docker-compose (#3586)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-13 10:49:55 -07:00
Victoria Bialas aee7e98fcb fixed links to topics w/underscores (#3583)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-12 19:35:08 -07:00
Joffrey F b60dd6facb Remove unsupported link_local_ips param from v3 doc (#3506)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-12 18:59:53 -07:00
Victoria Bialas 2cfb7ba743 added links to Compose release versions, improved matrix description (#3580)
* 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>
2017-06-12 18:40:51 -07:00
Victoria Bialas fa52e73dc5 Added notes and troubleshooting topic on volume mounts from host (#3556)
* 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>
2017-06-12 15:10:15 -07:00
Misty Stanley-Jones a173c4630d Document OOME information (#3536) 2017-06-09 09:41:00 -07:00
Victoria Bialas 12f96be8d8 added note on external volumes with docker stack deploy (#3541)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-08 17:35:02 -07:00
Victoria Bialas 63c7febfdd added Python, Docker Cloud install/run to known issues and setup notes (#3525)
* 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>
2017-06-07 18:36:50 -07:00
Victoria Bialas bb8146180f Compose improvements, env_file vars, rails sample (#3517)
* 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>
2017-06-07 14:05:34 -07:00
Victoria Bialas c239914df6 Compose CLI reference copyedits (#3499)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-05 17:35:44 -07:00
Victoria Bialas da9734a626 updated syntax for command in Compose files (#3498)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-05 16:37:54 -07:00
Joffrey F 000cb2ebc3 Add pids_limit to upgrade docs (#3366) 2017-06-02 11:51:38 -07:00
Ghislain Bourgeois 2a87df763d Specify tagging behaviour when running docker-compose build command. (#3428)
* Specify tagging behaviour when running docker-compose build command.

* Link image to compose-file reference.
2017-06-02 10:23:34 -07:00
Kasidesh Yontaradidthaworn 40db188f3f Update rails.md (#3421)
syntax error at Gemfile while compose run web rails new .
2017-06-02 09:54:40 -07:00
Victoria Bialas ffc99ea6e1 updated/improved Compose samples (#3438)
* 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>
2017-05-30 17:15:42 -07:00
Victoria Bialas 9a74081df7 add note re: ports for multi-site Wordpress (#3398)
* add note re: ports for multi-site Wordpress

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* incorporated review comments from Misty

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-30 13:20:33 -07:00
Victoria Bialas 5a610f6367 Compose examples (#3346)
* 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>
2017-05-23 23:26:57 -07:00
Harald Albers e9ad2f76eb Add docker-compose exec -u to reference page (#3349)
Signed-off-by: Harald Albers <github@albersweb.de>
2017-05-23 16:33:47 -07:00
zasca 87d08620aa Added unless-stopped restart policy (#3278) 2017-05-22 10:39:29 -07:00
Sergei Maximov e339059c43 Fix whitespace issues for compose/startup-order.md (#3284)
Signed-off-by: Sergei Maximov <s.maximov@teachmeplease.com>
2017-05-19 15:35:07 -07:00
Михаил a96de9f0f1 overview.md updated: typo fix (#3281) 2017-05-19 15:33:51 -07:00
Victoria Bialas b62449b3c8 clarified logging options in Compose, fixed glaring note formats (#3272)
* 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>
2017-05-16 12:02:54 -07:00
Victoria Bialas 8a9ffb234d fixed code example in Compose startup order per feedback (#3275)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-15 15:35:50 -07:00
Victoria Bialas 7c60f48705 updated notes in Compose install to map to new icon styles (#3259)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-13 22:23:50 -07:00
Ben Reichert 07a105d724 Add max-size, max-file logging options documentation (#3243) 2017-05-13 22:14:01 -07:00
Victoria Bialas 4dfebb9118 update Compose release link, clarified download pattern (#3225)
* 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>
2017-05-12 14:58:57 -07:00
Kevin Burnett 97582854b5 dotnet build fails without sql server dependency (#3215)
* dotnet build fails without sql server dependency

this makes the docs work for me
2017-05-10 11:58:10 -07:00
John Yani d0e12df054 Service create vs run (#3217)
This compose section should reference docker service create, not docker run options
https://github.com/moby/moby/issues/32844
2017-05-10 11:52:30 -07:00
Danny Tracey c4da71c5fa docs change for compose/networking (#3094)
* 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.
2017-05-10 11:26:29 -07:00
Victoria Bialas 1683168500 improved Compose samples overview page (#3212)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-09 16:35:16 -07:00
Victoria Bialas 105333e079 clarified use of volumes with stack files, services, swarms (#3201)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-08 18:50:45 -07:00
Victoria Bialas 7050d9060d expanded on pull command, added links to Compose samples (#3197)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-08 16:38:58 -07:00
Joffrey F 84c8ff4e63 Update scale docs
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-06 11:03:01 -07:00
Joffrey F 33b1c443a9 Add docs for IPAM options
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-06 11:03:01 -07:00
Joffrey F f6c5c41e2d Add v2.2 format description to versioning index
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-06 11:03:01 -07:00
Joffrey F 9f26b57158 Fix broken links to compose versioning docs and remove some obsolete notes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-06 11:03:01 -07:00
Joffrey F da867b5620 Add docs for new `init` option in service config
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-06 11:03:01 -07:00
Vlad 1b7091501a Fix indentation (#3180) 2017-05-05 21:48:18 +00:00
Marko Klemetti 1efadb8a88 Add sh/alpine -compliant wait-for to options. (#3157) 2017-05-04 21:28:58 +00:00
Victoria Bialas 71b91bd468 add detail on redis default port
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-01 15:56:50 -07:00
Andy Neff 3de6ebc21e Update docker-compose index.md (#3090)
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
```
2017-04-28 22:07:50 +00:00
hacfi 3e137458e8 Fix yml indention (#3089) 2017-04-28 22:06:04 +00:00
John Yani b07f615784 Wrong order of docker compose restart section (#3093) 2017-04-28 14:46:11 -07:00
Xianlu Bird 903df7ebfc Fix published&target description in ports section (#3016) 2017-04-26 20:52:14 +00:00
Daniel Maslowski 50e9e49552 Note on mixing network_mode with links in Docker compose file (#3049) 2017-04-26 20:50:47 +00:00
John Mulhausen f2cb46bf05 Fixes #3076 2017-04-26 13:33:54 -07:00
Lenny Linux 9a1f99cd11 add warning class and a linebreake to the warning blogquote (#2937)
* 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.
2017-04-25 11:33:27 -07:00
Victoria Bialas 5c2b6663c4 Windows server 2016 Compose install, Compose file format updates (#3035)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-25 10:44:34 -07:00
Victoria Bialas df4892c964 update re:container_name not supported in v3 Compose (#3003)
* 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>
2017-04-24 11:47:18 -07:00
Jonas B. Nielsen 82cf41f6f5 Links to compose file information terminates with 404 (#3011)
I have corrected the link in two places to what I expect to be the right resource.
2017-04-24 09:22:36 -07:00
John Harris f179037853 Clarify Swarm vs swarm mode with compose capabilities (#3008) 2017-04-23 11:44:11 -05:00
Germán Larraín 958fb121b0 django.md: fix Python image version (#2991)
Dockerfile's base image was not consistent the the explanation below.
2017-04-21 23:59:02 -07:00
Krassimir Valev a6ee7cfefe Fixed networks identation issues (#2989) 2017-04-21 23:58:05 -07:00
Julien Maitrehenry 3edabae435 Fix manager and worker join tokens
* 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
2017-04-21 14:05:12 -05:00
Suraj Narwade 28fdfd3b28 added `$` in commands (#2926)
resolves #2925
2017-04-21 11:17:39 -05:00
Bill a3a7ae1e0b replaced docker/docker with moby/moby (#2879)
* replaced docker/docker with moby/moby

* fixed incorrect name changes in release notes

* fixed mentions of moby/moby in code
2017-04-20 15:32:18 -05:00
Suraj Narwade 553db19401 Explains order of precedence between env-file and env (#2903)
Resolves #1312
2017-04-20 15:29:00 -05:00
Suraj Narwade e7c16b5fdc separate out the links (#2935)
* separate out the links

resolves #2934

* Update gettingstarted.md
2017-04-20 15:00:32 -05:00
Cory Locklear fb33155fc7 Fixes #1097. Add alert for potential edit of settings.py for ALLOWED_HOSTS for Windows 10 (#2886) 2017-04-20 12:07:58 -05:00
Jarrod Pooler 9c4f7e09af Update bash completion steps and add MacPorts steps (#2910) 2017-04-20 11:44:20 -05:00
Victoria Bialas b07dc066dc copyedits, reformat commands, updates for versions (#2942)
updated bash script wrapper commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-20 01:17:08 -05:00
Suraj Narwade 09eee26ef3 fixes command execution ambiguity in compose/install.md (#2905)
* fixes command execution ambiguity in compose/install.md

Resolves #1678

* copyedit to kick build
2017-04-20 00:15:19 -05:00
Suraj Narwade be37ddd557 Adding documentation for restart policy (#2912)
Resolves #1353
2017-04-19 17:05:02 -05:00
Shubheksha Jalan 2ec7b0d591 Remove deprecated --all option for `docker-compose rm` (#2821)
* remove --all from docker-compose rm
2017-04-19 14:49:25 -05:00
Suraj Narwade db6a60b806 Fixed django example (#2914)
Resolves #2468
2017-04-19 14:18:05 -05:00
Shubheksha Jalan d1308508e0 Make install instructions for Docker Compose clearer (#2814)
* clarify install instructions

* add direct install instructions for Ubuntu

* remove apt-get install instructions

* Edits
2017-04-19 07:03:20 -05:00
Rubab-Syed bdcd3be43c Add note that compose v3 doesnt support additional ipam configs (#2858)
* Add note that compose v3 doesnt support additional ipam configs (#1528)

* Fix minor tick (#1528)

* Edits
2017-04-19 07:00:23 -05:00
Shubheksha Jalan 7245c83c17 Add the --fail to `curl` commands when installing compose (#2817)
* Add the fail option to curl commands when installing compose

* move --fail to the beginning of the command for readability
2017-04-18 17:39:37 -05:00
Jesse Adametz 2dcd8d55a3 Clarifies compose push destination and requirements (#2843)
* Clarifies compose push destination and requirements

* Edits
2017-04-18 16:07:57 -05:00
Constanze Kratel 0cdec66639 Update composefile versions and quotes in examples
Changed version from 2 to 3, updated quotation marks to match example, changed front and back to frontend and backend.
2017-04-18 13:43:57 -07:00
Bhavin Gandhi 386d6dc6f7 Fix missing database user for Wordpress service (#2824)
* 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.
2017-04-18 13:03:08 -07:00
John Mulhausen 8820cfa6ff New 6-page "Get Started" (#2296)
* 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
2017-04-18 03:32:37 -05:00
padoo fabedfbc8b Update overview.md (#2805)
It should say 'predecessors', not 'successors'. Otherwise the sentence and the subsequent example don't make sense.
2017-04-16 17:00:39 -07:00
John Mulhausen add2f680e8 Default highlight.js off, dockerfile > conf highlighting, pygments (#2757)
* Default highlight.js off, dockerfile > conf highlighting, pygments

* Address feedback, style changes, markdownify reductions

* Getting rid of more markdownify

* Fix for right-hand nav spacing
2017-04-13 17:10:29 -07:00
Luis Bosquez fe5b942a0f Adding ASP.NET Core + SQL Server Compose Tutorial (#1536)
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.
2017-04-12 12:26:40 -07:00
xufei100 a8a33c1d07 Update compose-file-v2.md (#2702)
fix wrong link
2017-04-10 12:40:09 -07:00
Victoria Bialas 49c5bd7b6e updates for Compose group_add example (#2684)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-07 12:45:19 -07:00
Victoria Bialas 61aa60d039 clarified relationship btwn scale and replicas (#2683)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-07 11:38:21 -07:00
Jim Galasyn 1654a09c72 Fix broken samples link (#2682)
Replaced missing samples link with links to Getting Started and GitHub example files
2017-04-07 10:22:44 -07:00
mrfly 8316c1d0be There is a colon omitted in this section. (#2631) 2017-04-06 15:33:20 -07:00
Victoria Bialas 5f14289a3f added note re: VitualBox bug and Compose example (#2652)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-06 13:41:12 -07:00
Misty Stanley-Jones 2f4355c22a Fix compose links (#2624) 2017-04-04 15:03:50 -07:00
Misty Stanley-Jones 4fd4685ec5 Fix 404 (#2622) 2017-04-04 15:03:02 -07:00
Misty Stanley-Jones 3833596740 Adjust heading level (#2620) 2017-04-04 14:26:45 -07:00
Wang Jie 75d5a853e2 Update production.md (#2590)
* Update production.md

* Update production.md
2017-04-03 15:23:03 -07:00
Wang Jie d2974a5d3b Update startup-order.md (#2591) 2017-03-31 23:42:38 -07:00
Wang Jie a3417b8126 Update install.md (#2574) 2017-03-31 15:31:02 -07:00
Wang Jie a5502b4235 Update gettingstarted.md (#2576) 2017-03-31 14:22:01 -07:00
Wang Jie 15924442bb Update install.md (#2577) 2017-03-31 14:20:56 -07:00
Wang Jie 2b009778e3 Update overview.md (#2578) 2017-03-31 14:20:30 -07:00
Wang Jie fd5090abb4 Update envvars.md (#2579) 2017-03-31 14:16:58 -07:00
Wang Jie 0078fcb96b Update overview.md (#2554) 2017-03-30 16:56:47 -07:00
Misty Stanley-Jones c6aca8acee Improve bootstrap tabs (#2546)
Use data-target instead of href
Move tab-syncing code into site-wide JS so everyone can use it
Add example for syncing tab groups on the same page
2017-03-30 12:57:37 -07:00
Misty Stanley-Jones 669b51a889 Fix broken links (#2521) 2017-03-28 16:42:44 -07:00
Victoria Bialas 93bab5a66f Vnext compose (#2509)
* 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>
2017-03-28 10:50:44 -07:00
Daniel Nephin add1325878 Add ports and volumes long form syntax to compose-file reference (#2283)
* 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>
2017-03-27 20:49:00 -07:00
Victoria Bialas 2f14b6ea51 added compose file example in accordion (#2477)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-24 19:48:19 -07:00
Joffrey F f6c62c3934 Typo in compose overview page (#2445)
Add missing space.
2017-03-22 17:53:32 -07:00
Mateusz Kurek 92523b274e Fix external links from compose file docs (#2401)
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.
2017-03-21 11:55:35 -07:00
Victoria Bialas 5591401a2d clarified Compose file topic structure, and file examples (#2322)
copyedits, rewrite

fixed some links

simplified/shortened this topic

tweaked description of key, option, value

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-15 10:13:11 -07:00
Derek Bender 330ed3d24a fixup compose-file/index.md link (#2347) 2017-03-15 09:56:17 -07:00
Misty Stanley-Jones fb7c73908b Update the styleguide (#2332)
* Update the styleguide

Also normalize admonition titles with the colon outside the bold.
2017-03-15 09:46:30 -07:00
Victoria Bialas 9e244bbb9c added links to example of using overlay network in swarm mode (#2331)
added more links re: overlay networks

provided more links to networking topics, restructured the section

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-14 18:46:44 -07:00
Daniel Nephin 37333c8fe8 Fix depends_on in Compose file v3 reference (#2278)
* 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>
2017-03-14 17:38:59 -07:00
Victoria Bialas d784ad5c1f added more detail for Compose env (#2310)
incorporated Joffrey's comment

fixed heading levels

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-14 14:30:35 -07:00
Victoria Bialas f9d7107499 update to docker-compose rm reference per Compose v3 (#2288)
corrected docs to reflect docker-compose version update

updates per Joffrey's comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-13 15:53:19 -07:00
Victoria Bialas 4b9493d276 fleshed out Machine scp command description, fixed Compose file notes (#2265)
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>
2017-03-10 16:30:26 -08:00
Ryan Sanford a1ce533207 Update tail docs to match built-in docs (#2253)
Default value for tail helps me remember it's not a switch, but requires a value. This change makes it match the built-in docs.
2017-03-10 11:56:24 -08:00
Victoria Bialas 66d905032a Merge pull request #2239 from londoncalling/compose-startup-order-waitforit
clarified scripts logic for compose startup order
2017-03-09 17:10:54 -08:00
Victoria Bialas d1723bfe1f copyedit
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-09 16:59:17 -08:00
Misty Stanley-Jones a9bac844a5 Merge pull request #2160 from endlos/patch-2
Update rails.md
2017-03-09 15:45:09 -08:00
Victoria Bialas ec7774f46c clarified scripts logic for compose startup order
changed 'note' to 'tip'

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-09 12:04:26 -08:00
Victoria Bialas a020b82489 fixed link to Compose v2 restart
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 18:26:52 -08:00
Hugo 7b83cfebab Update rails.md 2017-03-06 20:01:57 -05:00
Piyush Maurya b582d52d94 update v1.11.1 to v1.11.2 (#2102) 2017-03-06 12:06:06 -08:00
Victoria Bialas 00d60e3054 Merge pull request #1979 from flemzord/patch-1
Change version for docker-compose
2017-03-02 15:34:02 -08:00
Victoria Bialas 09c432495f clarified docker stack deploy and bundles
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-01 18:30:48 -08:00
Joe Meissler b93760bea5 merge other changes, fix typo 2017-03-01 15:01:26 -08:00
Joe Meissler 32e4923e32 Merge branch 'master' into patch-1 2017-03-01 15:00:00 -08:00
Joe Meissler 963e6b5e6c mem_swappiness for current version and v1 2017-03-01 14:56:18 -08:00
Joe Meissler 5c87ba4009 Add documentation for mem_swappiness 2017-03-01 14:48:19 -08:00
Misty Stanley-Jones a3b95e3f0c Merge pull request #1803 from mtoothman/patch-1
Update run.md
2017-03-01 14:24:53 -08:00
Victoria Bialas 1b05f61663 Added "related topics" section 2017-03-01 13:47:13 -08:00
Matt d53941fa43 Update run.md
Address PR feedback.
2017-02-28 21:30:53 -05:00
Maxence Maireaux 28b1897289 Update install.md 2017-02-25 21:12:12 +01:00
John Mulhausen 4d93d1790b Fixes #1887 2017-02-22 13:56:50 -08:00
Misty Stanley-Jones 4576e1a6b7 Merge pull request #1921 from docker/fix-secrets-mode-doc
Fix error about permissions in secrets doc
2017-02-22 10:39:22 -08:00
Misty Stanley-Jones 93709c2b12 Merge pull request #1900 from shin-/missing_options_composefileref
Updated miscellaneous list of options for each format
2017-02-22 10:13:39 -08:00
Misty Stanley-Jones 33857cfe29 Tweaks 2017-02-22 09:49:09 -08:00
Misty Stanley-Jones 85bcea8ac1 Fix error about permissions in secrets doc
Also link to a resource for figuring out the right mode, since not all our readers are UNIX gurus.
2017-02-22 09:45:56 -08:00
Misty Stanley-Jones 9578525701 Merge pull request #1853 from knaperek/patch-1
Clarify compatibility of "networks" with more recent versions of compose.
2017-02-22 09:35:06 -08:00
Joffrey F 3e4005c360 Updated miscellaneous list of options for each format
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-21 13:11:37 -08:00
Misty Stanley-Jones ef4671f75e Document secrets in compose file reference 2017-02-21 09:09:32 -08:00
mapk0y edfcf0c485 fix broken links in composer-file/index.md (#1857)
Signed-off-by: mapk0y <mapk0y@gmail.com>
2017-02-20 02:48:33 -08:00
Jozef 3083031907 Update networking.md
Clarify compatibility of "networks" with more recent versions of compose.
2017-02-18 20:16:35 +01:00
Victoria Bialas 4a70dd4cb2 removed on-page topic menu from ref pages
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-17 18:02:58 -08:00
Victoria Bialas a6eb34f018 added x-ref from scale reference to replicas in v3 Compose
incorporated Joffrey's comments

surface h1's in left menu on Compose file refs, fix liquid issue

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-17 17:23:52 -08:00
Andy Bulford 5160f1cf0b Remove 1.10.0 references from install.md
These were missed from PR #1819 so also needed updating to 1.11.1.
2017-02-17 14:30:45 -08:00
Victoria Bialas d9e2d542ca Merge pull request #1831 from londoncalling/compose-restart-link
fixed link in Compose file, modified on-page TOC
2017-02-17 14:18:57 -08:00
Victoria Bialas f36ad2fa3a fixed link in Compose file, expanded on-page TOC's to show more subtopics
fixed a link to variable substition in Compose v.3

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-17 14:07:32 -08:00
Andy Bulford a09e279035 Update install.md to refer to version 1.11.1 2017-02-17 13:11:25 -08:00
Matt fb0f9d56bc Update run.md
Minor grammar cleanup.
2017-02-16 22:20:42 -05:00
Victoria Bialas 40f912237b Merge pull request #1802 from londoncalling/Compose-extends-update
edit per Joffrey re: PR #1763
2017-02-16 18:37:30 -08:00
Victoria Bialas 49323a1137 edit per Joffrey re: PR #1763
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-16 18:20:09 -08:00
Victoria Bialas e845620aaf fixed nav menus to surface Compose file reference, changed links to several manuals to overviews
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-16 18:06:05 -08:00
Victoria Bialas 0396353b08 Merge pull request #1763 from Electron-libre/master
fix(compose:extends): not supported from version 3
2017-02-16 16:35:21 -08:00
Dirk d8d822adff Added a bit more detail to restart.md (#1668)
This killed me for a while, I expected that since environment variables were set after the build process that they would be reloaded on restart.
2017-02-16 16:00:24 -08:00
Roque Pinel be682d4f42 Fix startup-order.md link (#1769) 2017-02-16 14:48:46 -08:00
Victoria Bialas 03464b70cb changed `version 3` to `version 3.x` per Joffrey 2017-02-16 14:37:03 -08:00
John Mulhausen 989b3a7113 Update compose-versioning.md 2017-02-16 11:54:32 -08:00
Cedric Brancourt 0f4a08f916 fix(compose:extends): not supported from version 3 2017-02-16 19:39:23 +01:00
Tarun Chinmai 06583c91d9 Changed the `rails` command to `rake`
changed `rails db:create` to `rake db:create`
2017-02-15 22:14:18 +05:30
Devis Lucato 73662f59cb Fix broken links
Fix the broken links at the bottom of https://docs.docker.com/compose/compose-file/ page
2017-02-14 10:47:06 -08:00
Misty Stanley-Jones 404fa2295a Merge pull request #1608 from joaquincasares/patch-1
Update index.md
2017-02-13 16:51:44 -08:00
Misty Stanley-Jones 4e9553176f Merge pull request #1630 from ifraixedes/patch-1
Fix yml file in compose alias example
2017-02-13 16:44:07 -08:00
Misty Stanley-Jones 6cbbf69ca0 Merge pull request #1636 from shin-/v3-network-config
Remove unsupported IPAM config entries in v3
2017-02-13 16:41:58 -08:00
Josh Wyatt d5f60821fd Correct misspelling 2017-02-13 12:37:17 -08:00
Joffrey F 11f7db62e5 Remove unsupported IPAM config entries in v3
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 12:14:50 -08:00
Ivan Fraixedes e7f6f5ab36 Fix yml file in compose alias example 2017-02-13 16:21:37 +01:00
Joaquin Casares 483d318528 Update index.md 2017-02-10 19:16:53 -06:00
Victoria Bialas b9f6524a28 Merge pull request #1603 from londoncalling/compose-and-docker-run
compose copyedit
2017-02-10 14:54:31 -08:00
Victoria Bialas 1db710d8f3 compose copyedit
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 14:18:32 -08:00
John Mulhausen 9abc9e9f41 Add documentation for new top command (#1534) (#1601)
Update command lists to include recent additions

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-10 13:59:06 -08:00
Victoria Bialas 19b5b6ad9e clarified getting started Compose topics based on user feedback
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 11:49:52 -08:00
Marko Schulz 107be08421 Small documentation fix
There are four files (`Dockerfile`, `Gemfile`, `Gemfile.lock`, `docker-compose.yml`) described for the setup.
2017-02-10 12:29:47 +01:00
Victoria Bialas b7dfc2921e re-wording, copy-edit 2017-02-09 22:43:37 -08:00
Victoria Bialas 2b7c238b0c copyedits and improvements to Compose reference
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-09 19:40:27 -08:00
Victoria Bialas 55b004036a added drafts of versioned compose reference files
pruning Compose file v2 reference

updated Compose v1, v2, v3 files, still WIP

added includes for compatibility matrix, fixed TOC menu

new topic organziation Compose reference, split two 3 files plus versioning

Daniel's comments, fixed links, added more to versioning details

fixed volumes_from example per Daniel's comments for v1

simplified links to version references

copyedits and improved/surfaced links to versioning/upgrade docs

removed for version specific content re: volume_drivers from various files

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-09 17:39:08 -08:00
pedep be447bf1b5 Fix markdown rendering of example configuration (#1544)
* fix code block formatting after list

add comment between code block and list to fix markdown rendering

* Update compose-file.md

* Update compose-file.md
2017-02-08 15:49:14 -08:00
Juan Eugenio Abadie 91cc808b23 Fix link (#1392) 2017-01-26 14:12:28 -08:00
Michael Friis 2fb946b8f0 fix anchors (#1381)
signed-off by Michael Friis <friism@gmail.com>
2017-01-26 02:58:54 -08:00
Victoria Bialas bfbfbeeec5 added missing descriptions for update_config options
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-25 14:31:07 -08:00
Misty Stanley-Jones ef95a915eb Fixing broken links
Formatting improvements along the way
2017-01-25 11:51:14 -08:00
Juan Eugenio Abadie 2f472446a1 Add udp ports example (#1098) 2017-01-24 15:49:44 -08:00
Nick van der Meij bb81ccb937 Update envvars.md (#1008)
* Update envvars.md

Update envvars.md to reflect the supported values of COMPOSE_CONVERT_WINDOWS_PATHS

* Update envvars.md
2017-01-24 15:37:06 -08:00
Zhe Zhang cf42e71f2e update compose install to 1.10.0 (#1314) 2017-01-24 14:48:37 -08:00