Commit Graph

1154 Commits

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