Commit Graph

1603 Commits

Author SHA1 Message Date
Simon e1680e14be
Add new Docker Compose Example Screenshots (#12012)
* TASK: Remove Old Screenshots

* TASK: Add New Screenshots

* TASK: Delete quick-hello-world-3.png

* TASK: Add new quick-hello-world-3.png screenshot

* TASK: Delete Screenshots

* TASK: Add new Screenshots
2021-01-18 15:21:46 +00:00
Usha Mandya 72f7f2481c
Merge pull request #12029 from git-developer/patch-1
fix: update name of config option `network_mode`
2021-01-08 14:32:51 +00:00
Sebastiaan van Stijn 3a794b3197
(temporarily) replace compose-file deep links to v3 docs
The documentation curently doesn't contain reference docs for the
unified (version-less) compose-file syntax, so for now replacing
all links to point to the v3 compose-file reference, which is still
present.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-01-07 14:21:37 +01:00
Brennan Kinney 12cf9156fd
[fix]: Fix links to Compose File v3 reference [Docs: docker-compose restart] (#12026)
* Fix links to Compose File v3 reference

No longer `compose-file/index.md`, but `compose-file/compose-file-v3.md`.

* Update compose/reference/restart.md

Co-authored-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
2021-01-06 14:51:45 +01:00
Sebastiaan van Stijn c02693a1fb
Merge pull request #11943 from woidda/patch-1
Update gettingstarted.md
2021-01-05 13:09:22 +01:00
Christian 2ff837ea7c
fix: update name of config option `network_mode` 2021-01-03 09:29:25 +01:00
Alexander Pushkov 73fcf32f7c
Fix heading level 2020-12-29 00:02:15 +03:00
Tim McNamara 296a30ff26
Remove install.md as a place to go next
Removes a self-link from a "Where to go next" section.
2020-12-24 10:55:43 +13:00
Dr. Walter Kammergruber 50bccc3b01
Update gettingstarted.md
updating `docker-compose ps` output. Seems to be outdated
2020-12-19 20:16:24 +01:00
Usha Mandya 9295dcb94a
Merge pull request #11744 from aiordache/update_compose_docs
Reference compose spec in compose file formats
2020-12-18 09:45:45 +00:00
Rob Cowsill 16b8c5ecab
Explain Compose file relative path resolution
Explain relative path handling when multiple Compose files are specified
Mention use of the --project-directory option to override the path
2020-11-23 23:53:14 +00: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
aiordache d0f70fdbb9 Move v3 info to dedicated file
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-11-17 10:39:45 +01:00
Adam Leskis 451612fd48 remove unnecessary commands
these lines aren't needed anymore, and add extra layers to the final image.
2020-11-11 20:03:47 +00:00
George 00619263f4
Update up.md
An option's short form should not be used in descriptions since they are intentionally terse and as such does throw away the otherwise nice narrative provide by using the long form.
2020-10-31 23:40:22 -04:00
Hélène Martin e9e8e72304
Add note about anonymous volumes to docker-compose down (#11601)
* Add note about anonymous volumes

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-10-28 16:38:31 +00: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 9cb06108e2
compose: remove references to legacy swarm
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-23 16:18:31 +02:00
Sebastiaan van Stijn 0e3d0c36f1
more redirects for classic swarm
- The index pages were not in the redirect (they were not in the TOC,
  but were published before, so could be indexed).
- Added "redirect_from" pages that were in the pages that were removed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-23 16:15:24 +02:00
Sebastiaan van Stijn e3ef5c5085
machine: move overview page to /machine/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:44:05 +02:00
Sebastiaan van Stijn 03d60f916a
Replace "hide_from_sitemap" with "sitemap: false"
The `hide_from_sitemap` metadata variable was a custom thing we implemented
to add a "noindex" meta-header to pages and to exclude a page from the
search auto-complete.

However, pages with that option set would still be included in sitemap.xml,
resulting in search engines to visit those pages (only to discover they
should not index them).

This patch replaces the custom `hide_from_sitemap` value for `sitemap: false`,
which is a metadata variable that's defined by the "jekyll-sitemap" plugin
we use to generate the sitemap.xml;

https://github.com/jekyll/jekyll-sitemap/blob/v1.4.0/README.md#exclusions

Setting this variable will now:

- add a "noindex" metadata header to the page
- exclude the page from the sitemap.xml.
- exclude the page from /js/metadata.json (used for search autocomplete)

Also fixed an issue in the metadata.json where the `notoc` metadata was
used to exclude pages, however that variable is meant to disable the
in-page TOC (right-hand side navigation with anchor links).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:09:11 +02:00
Sebastiaan van Stijn 088c702b21
Merge pull request #11587 from usha-mandya/engdocs-354
Remove Docker Toolbox docs
2020-10-20 23:33:50 +02:00
Usha Mandya e885a5aeaa Remove Docker Toolbox docs
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2020-10-20 18:05:36 +01:00
Sebastiaan van Stijn 92e2068c38
[Desktop] remove content refering to removed "osxfs" topic
This topic was removed in 9bebb666d9

We may want to add back the part describing sharing sshagent somewhere,
which is not really a feature related to osxfs. Also, some generic
description about file sharing (permissions, syncing) should probably
be added back.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-20 14:08:46 +02: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
Sebastiaan van Stijn 393d3f6566
Add rel="noopener" to external links
See https://web.dev/external-anchors-use-rel-noopener/

Using noopener, as that addresses the security issue. "noreferer" blocks
the REFERER header, which may still be useful for some target URLs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-12 13:09:30 +02:00
Liu Lantao 2a40c14676
update according to reviewer suggestion
Signed-off-by: Liu Lantao <liulantao@gmail.com>
2020-10-11 13:03:54 +08:00
Liu Lantao c59542a042
Update rails.md
Fix parameter error in compose document.
2020-10-11 13:02:37 +08:00
Sebastiaan van Stijn 2eff941697
compose: move deprecated env-vars section, and fix duplicate redirects
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-07 12:49:30 +02:00
Sebastiaan van Stijn b3d8bfa7c5
Remove old "Using Compose with Swarm" page
This page describes using docker compose with legacy swarm,
which has been deprecated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-07 09:50:57 +02:00
Jak Spalding e94985b22a
Correcting update_config.monitor documented default value (#11034)
* Correcting update_config.monitor documentation

The default monitor period is 5s and cannot be set to 0. The lowest possible value is 1ns.

* Correcting default values
2020-10-01 09:44:00 +01:00
Anca Iordache 6f908532f4
Bump compose to 1.27.4 (#11418)
* Bump compose to 1.27.4

Signed-off-by: aiordache <anca.iordache@docker.com>

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-09-24 18:24:19 +01:00
Sebastiaan van Stijn f6adc80d9a
remove examples for ENV key value without '='
The `ENV key value` form can be ambiguous, for example, the following defines
a single env-variable (`ONE`) with value `"TWO= THREE=world"`:

    ENV ONE TWO= THREE=world

While we cannot deprecate/remove that syntax (as it would break existing
Dockerfiles), we should reduce exposure of the format in our examples.

Also updating some code-blocks that were missing language-hints

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-23 15:16:35 +02:00
Sebastiaan van Stijn 26916468d3
compose: add highlighting and automate version for compose-file
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-22 15:25:20 +02:00
Usha Mandya 8f2327a1aa
Merge pull request #11250 from sohmil97/patch-1
update docker-compose version
2020-09-22 14:23:51 +01:00
aiordache d09b63f320 Bump compose to 1.27.3
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-09-16 16:43:26 +02:00
Anca Iordache 85e11b239f
Bump docker-compose to 1.27.2 (#11360)
* Bump docker-compose to 1.27.2

Signed-off-by: aiordache <anca.iordache@docker.com>

* Update formatting

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-09-14 08:16:22 +01:00
Anca Iordache 52497c10bd
Bump docker-compose to 1.27.1 (#11357)
* Bump docker-compose to 1.27.1

Signed-off-by: aiordache <anca.iordache@docker.com>

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-09-10 16:15:09 +01:00
Usha Mandya f57bd0b321
Merge pull request #10717 from thaJeztah/compose_samples
compose: add WordPress example to TOC
2020-09-08 16:29:31 +01:00
Ulysses Souza 411bf944cb
Update docs on command help (#11341)
* Update docs on command help

This is change is based on the output of the script proposed by @smola
in: https://github.com/docker/docker.github.io/pull/11173


Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>

* Formatting updates

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-09-08 11:57:19 +01:00
Anca Iordache 4236ca0914
Post docker-compose 1.27.0 (#11344)
* Post docker-compose 1.27.0

Signed-off-by: aiordache <anca.iordache@docker.com>

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-09-08 11:56:45 +01:00
Usha Mandya 1c8cdff1e4 Fix extra space in Compose file ref 2020-09-03 15:19:55 +01:00
Usha Mandya 9df2ab4aaf
Merge pull request #11287 from DavidTheProgrammer/patch-1
Added documentation for docker-compose --env-file option to compose/environment-variables.md
2020-08-26 16:43:48 +01:00
Usha Mandya ad5bd1a13c
Merge pull request #11204 from melaniemkwon/patch-1
Update quickstart Django example
2020-08-26 13:48:41 +01:00
Usha Mandya 7d9d5f3aac
Minor style updates 2020-08-26 13:40:21 +01:00
Usha Mandya be5688b2d2
Merge pull request #11092 from jasonsychau/patch-1
Proposition in startup-order.md
2020-08-26 09:37:00 +01:00
Muma David Bwalya 231b04065e
Update environment-variables.md
I'm not sure if these are in the right place, but I think it's really important it's somewhere.

Closes issue https://github.com/docker/docker.github.io/issues/11286
2020-08-24 17:48:26 +02:00
Sohrab Shahinfar b6cace9640
update docker-compose version
update docker-compose.yml to version 3
2020-08-15 15:32:27 +04:30
Usha Mandya 1532bb4772 Fix md syntax 2020-08-12 09:56:06 +01:00
Mark Schmale ce341bd72f
Add note about setup being not viable for production (#11228)
* Add note about setup beeing not viable production

I think there should at least a small hint that this guide is just intended as a bare-bones development environment and should not at all be rolled into production like this. 
Relates to #7622

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-08-11 15:36:25 +01:00