Commit Graph

1124 Commits

Author SHA1 Message Date
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