Commit Graph

1721 Commits

Author SHA1 Message Date
Usha Mandya
4211bf5820 Merge pull request #13999 from tomlankhorst/patch-1
Fix `driver_opts` indent
2021-12-17 11:10:09 +00:00
Stefan Scherer
a78ebbaab8 Add compose V2 version variable
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2021-12-17 11:45:21 +01:00
Jim Flattery
0ead2583b5 Make Compose-Switch version dynamic (#13922)
* Make Compose-Switch version dynamic

Fixes https://github.com/docker/docker.github.io/issues/13914

* Update cli-command.md

Fix typo by remove unneeded parenthesis.

* Updating to the latest version

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-12-17 10:39:27 +00:00
Tom Lankhorst
52cde9ff94 Fix driver_opts indent 2021-12-17 07:44:42 +01:00
Benson Muite
1e942679ff Indicate extends can be used again (#13695)
* Indicate extends can be used again

https://github.com/docker/compose/pull/7588

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-11-26 15:11:47 +00:00
Max Juchheim
93fe0d15dd take "+ tab" out of the monospaced codeword (#13730)
* take "+ tab" out of the monospaced codeword

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-11-19 12:49:44 +00:00
Sebastiaan van Stijn
4a3d70921e Merge pull request #13753 from Ap0them/patch-1
Update install.md
2021-11-11 15:54:29 +01:00
Sebastiaan van Stijn
9f081ba55c Merge pull request #13745 from TheDarkTron/patch-1
Added space to fix layout
2021-11-11 15:02:29 +01:00
ndrwrbgs
dcb6e1ca89 s/an Docker/a Docker/ 2021-10-29 14:26:37 -07:00
Ap0them
9be494d3c7 Update install.md 2021-10-28 22:11:04 -06:00
TheDarkTron
150b6dff04 Added space to fix layout 2021-10-28 12:48:59 +02:00
Usha Mandya
c5f38d8b3b Add the next set of CTAs
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-10-15 18:06:39 +01:00
Dan Bamikiya
f08b041774 Set correct Compose version in Linux installation guide 2021-10-11 17:22:28 +01:00
Usha Mandya
4ff155699b Merge pull request #13549 from KeithScheiwiller/update-dockerize-repo
#13548 Update Dockerize repo URL from jwilder/dockerize->powerman/dockerize
2021-10-08 10:40:35 +01:00
Usha Mandya
b50aee5bd1 Add CTA to the Docker Compose install page
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-10-07 11:22:26 +01:00
Mathieu Champlon
c13993f724 Fix Linux Compose install instructions
See https://github.com/docker/compose/issues/8758
2021-10-06 13:39:31 +02:00
Jenny Wu
d96b8f559c Modify With oh-my-zsh shell part (#13556)
* Modify With oh-my-zsh shell part

Tell user how to open the file and test whether it is successful.

* Update completion.md

Remove references to specific editors

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-10-04 16:19:32 +01:00
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
Keith Scheiwiller
ca1e0717c4 Update Dockerize repo URL from jwilder/dockerize->powerman/dockerize 2021-09-15 21:01:00 -05: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