Commit Graph

1703 Commits

Author SHA1 Message Date
Mathieu Champlon
84e1577426 Fix version invocation for v2 2021-10-04 06:41:02 +02:00
Usha Mandya
567a4e27ed Remove refs to Desktop 4.1
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-09-29 14:22:22 +01:00
Usha Mandya
9977cb1d5e Add note on linux install for 2.0
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-09-29 10:46:27 +01:00
Usha Mandya
3b9cdddf07 Update docs for Compose V2 release
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-09-28 15:38:43 +01:00
Sebastiaan van Stijn
173d3c65f8 fix broken (anchor) links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-13 15:07:49 +02:00
Rackme
03ee3ec672 Remove 'utility' capability
'utility' capability is not available for compose, only 'gpu' and 'tpu' are recognized :
Source: https://github.com/compose-spec/compose-spec/blob/master/deploy.md#capabilities
2021-09-07 15:51:40 +02:00
Usha Mandya
1211358729 Merge pull request #13461 from ndeloof/gpu_docs
fix yaml indentation in GPU docs
2021-09-07 12:11:05 +01:00
Nicolas De Loof
4c649a8c75 fix yaml indentation in GPU docs
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-03 14:18:29 +02:00
Nicolas De Loof
041277d14d document compose.v2 new repository and RC3 release
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-02 12:34:00 +02:00
Sebastiaan van Stijn
4c50937eff Merge pull request #13108 from altimmons/patch-1
Update environment-variables.md to include critical syntax info
2021-08-27 16:42:45 +02:00
Sebastiaan van Stijn
fb307b4d01 Merge pull request #13373 from rpatterson/patch-1
fix(yaml): Avoid bool type error
2021-08-27 16:02:53 +02:00
Jeff Anderson
510c2e3354 switch to community slack reference
remove a reference to defunct freenode channel
2021-08-24 10:22:36 -04:00
Ross Patterson
e0b3941eab fix(yaml): Avoid bool type error
Docs contained an invalid example:

```
ERROR: The Compose file './docker-compose.yml' is invalid because:                                                                                                                   
services.*.restart contains an invalid type, it should be a string 
```

Use quotes to avoid YAML's implicit type conversion.  Someone may also want to do an audit of [other type conversions that might cause problems](https://www.rpatterson.net/blog/docker-gotchas/#yaml-needs-some-zen).
2021-08-18 12:46:23 -07: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
Sebastiaan van Stijn
346a066b68 Desktop: move "docker-for-windows" to "desktop/windows"
Unifying all content related to Docker Desktop to be withing the desktop
directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-14 13:28:15 +02:00
Sebastiaan van Stijn
d0bf342e52 Desktop: move "docker-for-mac" to "desktop/mac"
Unifying all content related to Docker Desktop to be withing the desktop
directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-14 13:07:41 +02:00
Usha Mandya
3b40c60b3c Update Compose v2 docs
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-08-10 12:41:20 +01:00
Nicolas De loof
90bb8c20b2 document compose.v2 linux installation as a CLI plugin (#13289)
* document compose.v2 linux installation as a CLI plugin

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-08-06 18:39:04 +01:00
Sebastiaan van Stijn
ae3b5b66f9 compose: use "console" for shell examples
This allows for easier copying of the commands, without selecting the
prompt.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-06 17:20:07 +02:00
Sebastiaan van Stijn
ac1be36710 compose/reference: use "console" for shell examples
This allows for easier copying of the commands, without selecting the
prompt.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-06 17:20:07 +02:00
Andy Timmons
e2162d8b64 Update environment-variables.md to include critical syntax info
I looked forever to find this information.  The expected section to find this information is this page, not where it ends up at the bottom of overview.

Based on the v3 overview of compose-files, it seems it can be included with this line- as thats how they did it there.

A link would also work, or a copy of the whole section.  Using include has the added benefit however of making a single section with changes updated across the docs if needed.
2021-07-02 11:05:13 -04:00
satotake
0b239bddde compose: make project directory explicit (#12978)
* compose: make `project directory` explicit

See https://github.com/docker/compose/issues/8347 .
Some users assume that `project directory` is the directory which has `docker-compose.yaml`.
But this is not true (at least for now) when you execute `docker-compose` in sub directory.
This PR makes it clear.

* fix a typo and made style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-06-11 11:20:21 +01:00
Usha Mandya
f8066c33ef Merge pull request #12985 from shokkunrf/fix-compose-file-syntax
Fix a typo by adding a quote
2021-06-10 10:20:40 +01:00
shokkunrf
3d64de6303 Fix a typo by adding a quote 2021-06-09 20:07:50 +09:00
Usha Mandya
7c9ec0d344 Add docs for Compose V2 beta
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-06-07 13:51:16 +01:00
Paul Townsend
fea0d8fea8 Minor grammar fix ("an unified" -> "a unified") 2021-06-04 12:35:51 +01:00
Usha Mandya
1de80f78c3 Merge pull request #12795 from lightmare/patch-1
startup-order: fix example executing unquoted cmd
2021-05-21 11:13:29 +01:00
Ulysses Souza
d491238592 Update with docker-compose 1.29.2 (#12829)
Update with docker-compose 1.29.2

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-05-11 14:58:53 +01:00
Sebastiaan van Stijn
76cd47dff8 Merge pull request #12808 from MessaoudiM/patch-2
Update networking.md
2021-05-10 11:50:59 +02:00
unknown
9463f35e56 removed version 1 from composefileref 2021-05-07 11:49:37 -05:00
MessaoudiM
4b185f9233 Update networking.md
Following the example will produce:
  WARN[0000] network my-pre-existing-network: network.external.name is deprecated in favor of network.name

https://github.com/docker/docker.github.io/issues/6453
2021-05-06 22:00:22 +02:00
lightmare
bde2d6bc50 startup-order: fix example executing unquoted cmd 2021-05-04 13:09:05 +02:00
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