docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
59,371 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

115 Commits

Author SHA1 Message Date
Benjamin White e5e8051b59 Fix events JSON blob format (#6195) 
* Update example events JSON blob

The example JSON blob given doesn't match up with the values I experience when running `docker-compose events` myself, so I'm updating the documentation to save someone else some time.

* Add link to event types for convenience
 2018-03-27 11:17:37 -07:00
Joffrey F 12757bf953 Compose 1.20.0 (#6266) 2018-03-20 11:23:36 -07:00
BANO.notIT eb8f177865 Fix docker compose to docker-compose (#6033) 2018-02-20 10:00:15 -08:00
Joffrey F c399e1e479 Docs for Compose 1.19.0 release (#5826) 
* Docs for Compose 1.19.0 release

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 13:18:54 -08:00
Misty Stanley-Jones a55ddf60a9
Move /engine/installation to /install (#5651) 
* Move /engine/installation to /install

* Add Docker for IBM Cloud to the matrix
 2018-01-26 10:29:14 -08:00
Magnus Klingenberg 3e7bd5d26f Fix typo in build.md (#5821) 2018-01-25 18:00:00 -08:00
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788) 
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
 2018-01-25 17:37:23 -08:00
Dan Nissenbaum 2abb491a2d A frustrating typo (#5605) 2017-12-26 12:39:36 -08:00
Logan Rakai 1ff98b6467 Typo Correction (#5550) 2017-12-18 15:37:13 -08:00
Joffrey F 6e4339fc4d Update Compose docs to reflect changes in 1.18 release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-18 15:11:03 -08:00
Misty Stanley-Jones a9314c7ec7 Document new features in Compose 1.17 (#5019) (#5021) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 18:40:56 -07:00
Misty Stanley-Jones d8adc37e74 Revert "Document new features in Compose 1.17 (#5019) (#5021)" (#5038) 
This reverts commit 52fe0df34b.
 2017-10-18 16:07:20 -07:00
Misty Stanley-Jones 52fe0df34b Document new features in Compose 1.17 (#5019) (#5021) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-17 21:17:28 -07:00
Wang Jie 0a96073f07 Update envvars.md (#4999) 2017-10-17 17:40:46 -07:00
Wang Jie 1fae282146 Update build.md (#4986) 2017-10-16 16:59:31 -07:00
locofocos 955d8b37f4 Update "docker-compose up" doc to explain logging (#4672) 
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.
 2017-10-16 16:09:52 -07:00
Joffrey F 0702f23aae Document Compose 1.16.0 additions (#4293) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-31 15:52:18 -07:00
Joffrey F d03920a6e8 Rewrite exit codes paragraph (#4100) 
Improved accuracy and fixed grammar

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-08 14:15:50 -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
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
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 c239914df6 Compose CLI reference copyedits (#3499) 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-06-05 17:35:44 -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
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
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
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
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
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
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
Misty Stanley-Jones 2f4355c22a Fix compose links (#2624) 2017-04-04 15:03:50 -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
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
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 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
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
Misty Stanley-Jones a3b95e3f0c Merge pull request #1803 from mtoothman/patch-1 
Update run.md
 2017-03-01 14:24:53 -08:00
Matt d53941fa43 Update run.md 
Address PR feedback.
 2017-02-28 21:30:53 -05: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
Matt fb0f9d56bc Update run.md 
Minor grammar cleanup.
 2017-02-16 22:20:42 -05: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
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
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
Misty Stanley-Jones 756f4d974c Fix some doubled words 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-28 11:32:17 -08:00
LRubin 7da6a0bd21 add 'none' cue to large screentext block 
...to prevent weird syntax highlighting.
 2016-11-17 09:31:06 -08:00
Victoria Bialas b2eb693d00 Merge remote-tracking branch 'upstream/master' into vnext-compose-1.9.0-merge 2016-11-16 12:03:45 -08:00
Jeffery Bradberry b68ad3aced There are two differences 
Add missing word.
 2016-11-16 04:43:22 -05:00
Jonas Friedmann 4d83c1bb08 Add missing dollar-sign / consistent shell style (#426) 
* Add missing dollar-sign

* Remove dollar-sign for single commands without output
 2016-11-10 14:54:49 -08:00
Gaetan 2ea564166d fix type of keywords entry in frontmatter (in /compose/ dir) (#481) 
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-07 13:18:56 -08:00
Misty Stanley-Jones eb5c8670bc Change instances of alias: to redirect_from: 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-04 17:07:02 -07:00
John Mulhausen 558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438) 
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
 2016-11-04 15:38:40 -07:00
Misty Stanley-Jones ac0cef5d0f Merging master into vnext-compose 
includes conflict resolution

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-04 15:25:34 -07:00
Misty Stanley-Jones 0827ba283c Revert "fix frontmatter keywords values in compose/reference/ files" 2016-11-04 13:28:43 -07:00
Joffrey F 4c3cf8e7fd Update docs to mention new additions in Compose 1.9.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-03 15:05:24 -07:00
Gaetan de Villele bb4f3be02e fix frontmatter keywords values in compose/reference/ files 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-03 10:13:21 -07:00
Victoria Bialas 7fd5e20337 Update ps.md 2016-10-25 11:38:33 -07:00
LRubin 3129564e3d Merge pull request #251 from liubin/master 
remove redundant back slash
 2016-10-18 11:37:04 -07:00
Misty Stanley-Jones 01910ab6d9 Update branding for macOS 
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-18 09:21:09 -07:00
Bin Liu c8b449e7e0 remove redundant back slash 
I think this is a redundant back slash, should be removed.
 2016-10-18 22:31:25 +08:00
BSCheshir c98a6d8902 example pls 2016-10-08 23:35:37 +04:00
Misty Stanley-Jones d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones 701f170a21 Move docker-hub docs to docker-hub subdirectory 2016-09-29 10:38:52 -07:00
Misty Stanley-Jones 7629f462d5 Moved compose docs to compose subdirectory 2016-09-28 14:52:24 -07:00