Commit Graph

58 Commits

Author SHA1 Message Date
accetto 2099fd50a5
Update compose-var-sub.md (#16400)
Signed-off-by: accetto 34798830+accetto@users.noreply.github.com

Signed-off-by: accetto 34798830+accetto@users.noreply.github.com
2023-01-03 12:03:41 +00:00
Sebastiaan van Stijn 1583678203
Add missing code-hints, and minor markdown edits
- Add missing code-hints (console, yaml)
- Consistently add an empty line after code-blocks
- Combine some examples where the output and the command were
  put in separate blocks. With the "console" code-hint, this
  is no longer nescessary.
- fix indentation in cloud/ecs-integration.md, which caused the
  numbered-list to be interrupted.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-16 12:59:23 +02:00
unknown 9463f35e56 removed version 1 from composefileref 2021-05-07 11:49:37 -05:00
Kenyon Ralph cc8e14ed15
compose-matrix.md: remove extra parenthesis 2021-01-21 17:41:55 -08:00
Usha Mandya 97763f7a4a
Minor style update 2021-01-20 18:32:22 +00:00
Nicolas De Loof 7c8c667165
clarification on .env file lookup vs project-directory
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-01-20 17:20:14 +01:00
aiordache 00119346fe Reference compose spec in compose file formats
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-11-17 10:42:36 +01:00
Sebastiaan van Stijn 2ce808edc0
Remove references to obsolete engine versions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-26 15:45:07 +01:00
Sebastiaan van Stijn c119ed174e
Use https:// for links and examples
Found these using `http://[^lp10\*`<][^o]` (to exclude "localhost" and IP-addresses)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-13 12:09:11 +02:00
Usha Mandya 1c8cdff1e4 Fix extra space in Compose file ref 2020-09-03 15:19:55 +01:00
zachvalenta 54af1d319d add code formatting for compose-var-sub 2020-08-25 17:09:57 -04:00
Sebastiaan van Stijn 66d0e68df6
_includes: use absolute links instead of links to Markdown files
We cannot use relative links in includes, because:

- The jekyll-relative-links, is not called on includes, so
  markdown-links are rendered as-is.
- These files are included in various locations on the website;
  because of that, it's not possible to compose a relative link
  to other Markdown files, so we're falling back to using absolute
  URLs, relative to the root of the website.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 10:00:42 +02:00
Sven Dowideit d5e7a26efe
Mention Docker 19.03 and its compose file version - and add max_replicas_per_node
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2020-04-17 08:49:33 +02:00
Sebastiaan van Stijn 331554f4b3
Fix various links that were generating URLs with `.md` (#10548)
* Fix incorrect links in compose section

there's a bug causing wrapped links to not work, and replacing
some links to point to the .md file, so that IDE's can check
if the anchors are valid. Also replaced some links to point
to their new location.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* engine/swarm: update links

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Fix various broken links

There's a bug in the "jekyll-relative-links" plugin that causes wrapped links to not work.
Also replacing some links to point to the .md file, so that IDE's can check if the anchors
are valid. Finally, replaced some links to point to their new locations, so that users don't
get redirected..

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-01 12:05:50 +01:00
Sebastiaan van Stijn 4cf38f289f
compose-file: reformat and rewrite some tips/notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 13:59:44 +01:00
Sebastiaan van Stijn 73c9649967
Move "Glossary" from top nav to "reference" section
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-14 09:10:38 +01:00
lena-larionova 54ca6a523b
Fixing glossary links (#9812)
Signed-off-by: Lena Larionova <lena.larionova@docker.com>
2019-11-06 11:00:13 -08:00
Sebastiaan van Stijn 38423908d4
Add highlighting to compose-file reference
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 12:14:44 +01:00
paigehargrave bb426a4408
Merge pull request #6397 from Maks3w/patch-1
Extension fields are only supported from 3.4
2019-01-03 13:14:46 -05:00
Anne Henmi 6ce462d71c
Merge pull request #7245 from VokaMut/changed-the-keys-for-the-ssh-add
Update ssh-add-keys-to-agent.md
2018-12-16 20:46:11 -07:00
Jeffrey Morgan ca466a55ed Rename Docker Store and Docker Cloud - WIP 2018-10-04 19:41:32 -04:00
VokaMut a198013b83
Update ssh-add-keys-to-agent.md 2018-08-21 16:07:44 +03:00
Joffrey F caad3ebe13 1.22.0 release notes and documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-05 13:32:51 -07:00
Charlie Hayes 54483a979d Updated version specification
The version specification used in the examples was before the feature was introduced and would thus never parse.
2018-06-15 15:09:49 -07:00
Xander Marjoram 87c84916f3 Documentation typo fixes 2018-05-18 10:06:05 -07:00
Joffrey F 8348f4ffb2 Document new Compose file additions
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Maks3w 80f1bdceeb
Extension fields are only supported from 3.4
Use the minimum supported version in the example
2018-04-07 18:04:49 +02:00
Joffrey F 2d12fdf671 Add docs for Compose file v3.5 and v3.6 (#5912)
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-08 13:54:12 -08:00
Joffrey F 761d421b5c Fix typos (#5944)
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-07 13:18:54 -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 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
Ernestas 23be886a82 max-file should be in quotes (#5506) 2017-12-14 14:29:29 -08:00
Victoria Bialas 92bd5b3ffa
Docs contributor guide: added links to subtopics on left-side menu (#5246)
* Docs contributor guide: added links to subtopics on right side menu

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

* copyedits

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

* more copyedits

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

* added back in some of the community pages by request

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

* added other ways to contribute to left side menu

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

* copyedits to contributor home page

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

* added links to Docker Community pages on GitHub

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

* merged ways to contribute, made moby an include, re-org for tocs

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

* fixed TOC yaml

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

* fixed on-page links on community page

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-11-09 13:56:59 -08:00
Victoria Bialas dfe6ee6cd1
updated include file to use code fences (#5229)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-11-06 16:15:52 -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
Gwendolynne Barr c84e1fb1d0 Add Compose 3.4/Engine 17.09 (#5036) 2017-10-18 14:05:34 -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
Misty Stanley-Jones cf950c1450 Clarify that Compose .env support does not work with docker stack deploy (#4812) 2017-10-05 16:53:40 -07:00
Joffrey F 0b22c35a28 Remove delayed features from 1.16.0, fixed changelog (#4417) 2017-08-31 15:52:18 -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
Yong Wen Chua 563c564d4c Document Docker Compose Version 2.3 (#3994)
And the new "target" parameter under "build"

Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-08-31 15:52:18 -07:00
Victoria Bialas e90b12c425 Added <hr>'s below tabbed topics for SSH and test page (#4232)
* added <hr>'s below tabs

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

* update Tabs topic on test.md to show use of <hr>'s

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

* added more information about toc_max/min

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-16 19:38:09 -07:00
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
Sebastiaan van Stijn b7312c13c0 Fix compose-file compatibility matrix (#3721)
- support for compose-file schema 3.1 was added in
  docker 1.13.1
- support for compose-file schema 3.2 was added in
  docker 17.04.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-28 11:53:26 -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 b46ee7e6a7 removed notes file no longer needed (#3274)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-15 15:19:08 -07:00
Victoria Bialas 01f1704c0f removed old content from liquid admonitions include file (#3271)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-15 11:49:31 -07:00
Victoria Bialas 7588f3c852 WIP: experiments with glyphicons in admonitions (notes) (#3231)
* experiments with glyphicons in admonitions (notes)

3 new admonition classes, re-write of test page

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

* copyedit on code formatting

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

* test Liquid admonitions with includes

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

* renamed notes.html, reviewed Liquid relationship to CSS

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

* added description of Liquid variables experiments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-12 11:20:27 -07:00
Victoria Bialas e552c02d7b WIP: add Cloud link to Azure topics (#2713)
* add Cloud link to Azure topics

WIP: 1st draft includes, tabs re: SSH key topics

adding more Azure Cloud content and SSH includes

copyedits

cloud azure, aws topics organization, videos

incorporated review comments

copyedits, colour-coded TBD's

copyedits to make create a swarm w/AWS and Azure consistent

updated links to use new titles

added SSH key setup to the Swarm overview list of links

updated link services titles

add ssh to glossary, note autoredeploy limitations

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

* screen snaps, updates per latest on staging

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

* added link

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

* resolved conflicts in TOC

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

* added Azure accept EULA/enable subscription, more steps, snaps

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

* fixed the comments to not break numbering

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

* new snaps and review comments incorporated from Alberto and Ryan

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

* added screen snaps, review comments, more steps

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

* added screen snaps, detail to Azure create swarm

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

* new snap showing linked AWS as provider

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

* AWS screen snaps and detailed steps

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

* AWS swarm name rules clarification

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

* added x-refs to edition topics on config per reviews

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

* added connect screen snap w/production commands, AWS pricing

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

* added more code examples and clarification to swarm connect

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

* added more code examples for Azure and AWS

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-02 13:28:55 -07:00