Commit Graph

1721 Commits

Author SHA1 Message Date
Kaden Scott 291db7791f
Remove trailing dot from filename 2021-05-01 21:53:29 -04:00
Usha Mandya d804b08495
Merge pull request #12746 from porterdarby/patch-1
`condition` is supported for `depends_on`
2021-04-27 13:17:45 +01:00
Guillaume Tardif 68aed40bf9
Remove more incompatible flags (#12751)
* Remove more incompatible flags

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-04-26 17:47:04 +01:00
Porter Darby c947472050
`condition` is supported for `depends_on`
Removed a statement about `condition` not being supported for `depends_on` in Version 3, as it is supported.
2021-04-24 22:05:45 -04:00
Zane Dufour 7e7645082e
Add --service-ports note to ports section (#12658)
* Add --service-ports note to ports section

## Description

Add note in `ports` section of file reference docs pointing to the `run` command's `--service-ports` flag

## Motivation

Spent quite a few hours spinning my wheels before I came across `run`'s `--service-ports` flag.

I'm struggling to find the issue where I found this, but the comment pointing to `--service-ports` had a lot of reacts, so this might be a relatively common 

## Things I'd still like to do

- [ ] link to the [`--service-ports` docs](https://github.com/docker/docker.github.io/blob/master/compose/reference/run.md) -- not sure how to do this
- [ ] clean up location of this note -- not sure if I've put the note in a good place -- we can shunt it to the bottom
- [ ] Duplicate for older versions

Thanks

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-04-23 16:17:59 +01:00
Sebastiaan van Stijn e22984f7d4
use Dockerfile "syntax" directive in examples
BuildKit allows using alternative Dockerfile syntaxes to introduce new features
without having to update Docker itself. The general recommendation is to always
specify a "syntax" directive in a Dockerfile, so that (if needed) older versions
of Docker can download the correct syntax to build the Dockerfile.

This updates our examples to include a syntax directive, to make users more familiar
with these directives, and to illustrate best-pracitces in our documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-20 10:19:12 +02:00
Sebastiaan van Stijn 8563a00ad8
compose: move reference/overview page
This makes the compose command-line reference available at;

https://docs.docker.com/compose/reference/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-19 10:54:04 +02:00
Sebastiaan van Stijn 91ac76ae80
compose: remove old "index" page in favor of "overview"
First step: remove the old "index" page, as it was not linked from the TOC, and
was serving the same purpose as the "overview" page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-19 10:43:11 +02:00
Sebastiaan van Stijn f4ed09424b
move compose examples to the samples directory
Unifying all "examples" in this directory; some of these should still be
reviewed and/or removed in favor of examples from "awesome compose"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-19 10:38:56 +02:00
Usha Mandya 0af20e212b
Merge pull request #12678 from aiordache/compose_1.29.1
Update release notes for docker-compose 1.29.1
2021-04-15 16:00:41 +01:00
Usha Mandya 023aced24e
Fix a typo 2021-04-15 15:54:31 +01:00
Anca Iordache 02ca9a22f6 Update release notes for docker-compose 1.29.1
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2021-04-14 19:12:25 +02:00
Edgars Baduns 7b6f2d918a
Clarify the source name of secrets and configs
The current wording of "name of the config as it exists in Docker" suggests that the real generated name is used, instead the "key" of `configs` object in the docker-compose file is used.

```yml
version: "3.5"

services:
  app:
    image: alpine
    configs:
      # documentation currently suggests this (the "name as in Docker")
      # this causes an error- undefined config "name-as-in-docker"
      - source: name-as-in-docker
        target: /config-with-name-as-in-docker.json

      # the correct source to use is the name (key) from this docker-compose file
      - source: name-as-in-file
        target: /config-with-name-as-in-file.json

configs:
  name-as-in-file:
    name: name-as-in-docker
    file: ./cfg.json
```
2021-04-13 19:28:07 +03:00
Ulysses Souza ecfa80f583 Update compose-cli compatibility list
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-04-09 09:54:35 -03:00
Anca Iordache e28309aaa3 Release notes for docker-compose 1.29.0
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2021-04-06 23:13:32 +02:00
Usha Mandya a255925773
Merge pull request #12542 from sobi3ch/patch-1
Update completion.md
2021-03-25 15:45:31 +00:00
Usha Mandya dda97d0fe9
Minor style update 2021-03-25 15:29:17 +00:00
Anca Iordache 0effb9f46e
Update release notes for docker-compose 1.28.6 (#12553)
* Release notes updates for docker-compose 1.28.6

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

* Fixed a typo

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-03-23 21:46:12 +00:00
Anca Iordache cc6762ecd3
Update docs on Compose environment files (#12514)
* Reorganize sections for variable substitution and document .env file path change for `1.28`

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

* Minor style edits

* Minor style edits

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-03-23 21:42:08 +00:00
Stig124 830a0071ad
Debugging the codeblock in the Linux install for Compose CLI (#12551)
* Fixed the codeblock in cli_command.md

* Add a prompt to ensure the command is selectable

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-03-23 21:37:57 +00:00
Piotr Sobieszczański 8b0e7fa79a
Update completion.md
Reload your bash after installation
2021-03-22 11:43:13 +01:00
Usha Mandya 5be8260c40
Merge pull request #12461 from irlcatgirl/patch-1
Fix docker-compose database volume configuration
2021-03-18 15:04:33 +00:00
Usha Mandya ddf8543d28 Fix comment from Chris and update a note format
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-03-16 13:41:11 +00:00
Usha Mandya dacfbd27e3 Remove another warning on V1 file reference
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-03-16 11:29:19 +00:00
Usha Mandya 5c64b4230a Remove references to v1 from other topics
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-03-15 19:35:03 +00:00
Usha Mandya 55b4fb8f37 Remove Compose file v1 ref docs
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-03-15 19:15:17 +00:00
Ulysses Souza 13a616b29a Update project directory precedence
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-03-10 11:15:40 -03:00
Usha Mandya 63c0c825c4
Merge pull request #12467 from usha-mandya/compose-update-patch
Minor wording update
2021-03-09 14:50:42 +00:00
Usha Mandya 7c23883e19 Update desktop version number
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-03-09 14:46:50 +00:00
Usha Mandya f839daebff
Merge pull request #12456 from JoshuaSchlichting/patch-1
Fixed networking.md malformed whitespace
2021-03-09 14:39:05 +00:00
Usha Mandya 2355e7f32c
Merge pull request #12458 from StefanScherer/fix-django-ps-command
Django: Use docker ps to be in sync with the sample output
2021-03-09 14:30:52 +00:00
Usha Mandya c3bc63edf1 Minor wording update
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-03-09 13:59:05 +00:00
Guillaume Tardif fd6a291c0b
Compose command doc (#12433)
* Compose in Docker CLI overview

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>

* Add compatibility list page for compose command

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>

* Apply suggestions from Usha

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Apply suggestions from Usha

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Latest update on compatibility list

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>

* Add install instructions

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>

* Suggestions by Marina

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>

* Subsection for compose CLI Tech Preview

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-03-09 10:59:03 +00:00
Catgirl 66c659a3e7
Add db volume information in docker-compose.yml 2021-03-08 15:55:03 -05:00
Stefan Scherer 8d2f2b639f
Django: Use docker ps to be in sync with the sample output
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2021-03-08 12:51:02 +01:00
Joshua Schlichting 11608ecb55
Fixed networking.md malformed whitespace
Adjusted what appeared to be malformed yaml whitespace in the 'Specify custom networks' section
2021-03-07 10:31:58 -05:00
Simon 5e78271505
TASK: Add codeblocks to code examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-04 12:06:54 +01:00
Guillaume Tardif 5d4a84d638
Compose minor improvements (#12426)
* remove duplicate compose release notes in TOC

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>

* Add link to awesome compose samples

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>

* Minor style update

* Fix a typo

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-03-02 17:01:51 +00:00
Anca Iordache cb2e2e6986
Update release notes for docker-compose 1.28.5 (#12401)
* Update release notes  for docker-compose 1.28.5

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

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-02-26 18:23:33 +00:00
Usha Mandya 99fd84490c
Merge pull request #12326 from rfay/patch-1
Show the 3-part port syntax more clearly
2021-02-19 12:23:00 +00:00
Usha Mandya e4d16ed579
Fixed heading 2021-02-19 09:41:35 +00:00
aiordache df16fac8ab Release notes updates for docker-compose 1.28.4
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-02-19 10:03:27 +01:00
Anca Iordache 1caceda0fe
Release notes update for docker-compose 1.28.3 (#12349)
* Release notes update for docker-compose 1.28.3

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

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-02-18 10:55:28 +00:00
Usha Mandya 2d47fdfa53
Merge pull request #12334 from ulyssessouza/pip-deps-update
Update dependencies on install
2021-02-16 10:41:07 +00:00
Usha Mandya 0e8576d5c0
Updated the link to use relative path 2021-02-16 10:24:11 +00:00
Chris Crone c6b0f82cb7 compose.gpu: Fix prerequisites link
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2021-02-16 11:00:19 +01:00
Ulysses Souza ad4f02e066 Update dependencies on install
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-02-15 12:40:55 -03:00
Randy Fay 5b2b270b3b
Show the 3-part port syntax more clearly
The 3-part (IP:HOSTPORT:CONTAINERPORT) syntax in `ports` has been there a long time, but isn't adequately described here.
2021-02-13 06:08:43 -07:00
Sebastiaan van Stijn 3e9b407952
Fix broken link in compose-file docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-02-12 19:46:37 +01:00
Anca Iordache 008dfe496d
Document GPU support in Docker Compose (#12315)
* Document GPU support in Docker Compose

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

* Update the note format

Added target=blank to enable external links to open in a new tab.

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-02-12 17:18:00 +00:00
Usha Mandya 6c15e5466f Add note on Compose file v1 deprecation
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-02-12 11:05:37 +00:00
Ulysses Souza 40af359350 Update pip install requirements
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-02-08 12:55:24 -03:00
Usha Mandya 4b176c5cfc Fix Compose install tab display issue
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-02-04 16:33:47 +00:00
Roman Anasal 6c64eeca65 Fix long line wrapping on Compose service profiles page 2021-01-27 14:47:40 +01:00
Roman Anasal 927ea24b04 Fix broken link in Compose service profiles page
broken by unclean rebase of
ca88315234
2021-01-27 14:40:54 +01:00
Usha Mandya 1094a1accd
Merge pull request #12186 from ulyssessouza/bump-compose-1.28.2
Bump compose 1.28.2
2021-01-27 10:32:50 +00:00
Usha Mandya 53916c3920
Updated the section to bug fixes 2021-01-27 10:29:10 +00:00
Ulysses Souza fe49f123a0 Bump compose 1.28.2
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-01-26 17:23:54 -03:00
Roman Anasal ca88315234 Add documentation for Compose service profiles
Adds docs for the new service profiles feature introduced
in docker/compose#7930

Co-authored-by: Chris Crone <christopher.crone@docker.com>
2021-01-25 14:42:20 +01:00
Roman Anasal 8971beb327 Fix alphabetical order of Compose env variables list 2021-01-25 14:38:21 +01:00
Usha Mandya 7cda3c8fc6
Merge pull request #12142 from ndeloof/dotEnv
clarification on .env file lookup vs project-directory
2021-01-20 18:34:12 +00:00
Usha Mandya 79ef26b640
Minor update 2021-01-20 18:32:44 +00:00
Usha Mandya 6ffd74e772
Merge pull request #12135 from aiordache/compose_bump
Bump docker-compose to 1.28.0
2021-01-20 18:31:18 +00:00
aiordache 1db41e6667 apply suggested fixes
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-01-20 18:41:05 +01: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
Usha Mandya 8489de14df
Merge pull request #11858 from thaJeztah/compose_native_build
Compose: add documentation on enabling/disabling native build
2021-01-20 15:46:35 +00:00
aiordache 706f1c7e08 Bump docker-compose to 1.28.0
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-01-20 11:26:55 +01:00
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
Sebastiaan van Stijn 027b9b6bcf
Compose: add documentation on enabling/disabling native build
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-12-08 12:45:51 +01: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