Commit Graph

1916 Commits

Author SHA1 Message Date
dockertopia ceb3ba021f Adding redirect to compose index 2022-08-22 15:36:45 +01:00
dockertopia a05f60ca05 Removing the completion.md file 2022-08-22 13:29:01 +01:00
Dockertopia fa2fd4f915
Revisiting of Environmental variables precendence (#15396)
* Rewriting based on knowledge transfer
* Fix and minor edits
2022-08-16 16:48:45 +01:00
Dockertopia 0f78616c7a
Merge pull request #15161 from ulyssessouza/envvars_precedence
Add new environment variables precedence matrix
2022-08-16 15:39:16 +01:00
Usha Mandya ff9a439940
Merge branch 'master' into patch-1 2022-08-10 11:30:42 +01:00
Charlie Arehart e077973634
correct grammatical mistake
I am assuming the missing "is" is what was intended for the sentence. Authorized folks can confirm or deny.
2022-08-09 11:42:42 -05:00
CrazyMax 09c9f51bcf
remove most of absolute urls
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-08-03 11:50:33 +02:00
Usha Mandya dfa7fc3b8e
Merge pull request #15227 from jedevc/linting-fixup
Fix linting 🎉
2022-08-02 17:35:10 +01:00
Dockertopia 4936d1fd7a
Updating Compose RNs (#15295)
* Adding 2.8.0 Compose RNs
* Adding 2.9.0 Compose RNs
2022-08-02 14:28:54 +01:00
Dora Ribeiro cbd4116e50
Removing bump to containerd in 270 (#15293)
Minor update to 2.7.0  RNs
2022-08-02 12:03:11 +01:00
jerae-duffin d3360e57b3
Update compose/release-notes.md
Co-authored-by: Guillaume Lours <guillaume@lours.me>
2022-08-01 14:56:06 -05:00
jerae-duffin 8a7199e3a8
Update compose/release-notes.md
Co-authored-by: Guillaume Lours <guillaume@lours.me>
2022-08-01 14:55:49 -05:00
dockertopia 2338eb5fd3 Adding Compose 2.7.0 Release Notes 2022-08-01 17:07:16 +01:00
Justin Chadwell ad45d2d936 lint: tidy spaces inside spans 2022-07-28 11:27:10 +01:00
Justin Chadwell fd9fe19061 lint: tidy up ordered list prefixes 2022-07-28 11:27:10 +01:00
CrazyMax af0fad132b
build: add bake section
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-07-27 18:58:28 +02:00
Allie Sadler cab9f914bf
ENGDOCS-846 (#15219)
* ENGDOCS-846

* fix broken links

* fix links

* fix broken links

* fix broken links

* fix broken links
2022-07-27 13:26:22 +01:00
Dora Ribeiro 72a3a45c0e
Replacing v1 syntax (#15185)
* Replacing v1 syntax
2022-07-26 18:08:28 +01:00
Dora Ribeiro 15e4c88517
Revisiting Compose CLI Env Vars page (#15063)
* Revisiting Compose CLI Env Vars page
* Adding feedback from the review and additional restructuring
* Adding relative URLs for the cli
* Removing anchor
* Apply suggestions from code review
Adding suggestions:  an additional default and updating compose file mention.
Co-authored-by: Guillaume Lours <guillaume@lours.me>
2022-07-26 17:19:25 +01:00
Ulysses Souza 1026e719a1 Add new environment variables precedence matrix
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-07-20 17:27:38 +02:00
BinaryWizard904 7f199a6d10
Fix other dead link in compose doc (#15147)
Turns out the dead-link to a permissions calculator fixed in PR 14985 only fixed one of two links.
This pull request fixes the other one.
2022-07-18 17:54:10 +01:00
Sebastiaan van Stijn a9b15d6253
desktop: settings: remove "-settings" suffix from URLs
The "-settings" suffix in the URL duplicated the "/settings/" directory
in the URL, which made it redundant.

Using "/mac/", "/windows/" and "/linux/" keeps the URLs shorter, more
memorable, and more consistent with other locations, making it easier
to "guess" the URL when navigating using the browser's location bar.

No redirects were added, because the "-settings" pages have not yet
been published.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-07-15 12:57:14 +02:00
Allie Sadler d17f279abc
create a global setting section for DD (#15122)
* create a global setting section for DD

* fix broken links

* fix broken links

* fix broken links
2022-07-14 15:56:51 +01:00
CrazyMax 5088f2d82b
fix redirects
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-07-13 18:02:43 +02:00
Allie Sadler 38fec0d159
Engdocs 802b (#15108)
* moved install pages

* moved images

* update toc

* add redirects

* ammend page links

* fix broken links

* fix broken links

* fix broken links

* fix broken links
2022-07-13 10:41:56 +01:00
Mohammad Abdolirad 541ff04313
Introduce Wait4X (#14947)
Introduce Wait4X as a waiting tool.
2022-07-06 12:28:18 +01:00
Dora Ribeiro f92bb4554b
Updating Compose release notes to 2.6.1 (#15026)
* Updating Compose release notes to 2.6.1
2022-07-05 17:15:27 +01:00
Dora Ribeiro 4b788070ac
Merge pull request #14985 from BinaryWizard904/patch-1
Fix Dead Link in the Compose specification documentation
2022-07-01 16:53:22 +01:00
Dora Ribeiro 36d6481f95
Merge pull request #15027 from angelcervera/patch-1
Fixing 'docker compose' syntax in Manuals/Getting started with Compose
2022-07-01 12:30:58 +01:00
Ángel Cervera Claudio 684a5629b6
"docker compose" instead "docker-compose" 2022-06-29 11:37:04 +01:00
pokir 18a85dcd9a
Fix spelling 2022-06-27 21:31:10 +03:00
BinaryWizard904 07f2ad2a42
Fix Dead Link on Compose specification
http://permissions-calculator.org is dead.  I replaced the link to it with one
to a working copy of the page hosted by the Internet Archive.
2022-06-22 11:36:14 -05:00
Usha Mandya 9403431ff7
Add Compose v2 reference (#14716)
* Add compose v2 reference
* Fix broken links
* Remove v1 compose reference files
* Remove Compose CLI completion

Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-06-21 13:12:05 +02:00
Gavin Foley bbd152b7ce
Add missing word 2022-06-18 13:55:21 -04:00
ShortBear 92c8590f59
Grammar fix: changed "is build" to "is built" (#14918) 2022-06-13 16:15:03 +01:00
Usha Mandya 43ad83d554
fix: typo (#14898) 2022-06-10 11:21:02 +01:00
Dora Ribeiro 0dd93e250e
ENGDOCS-744 Compose Install Fixes (#14892)
* Review feedback edits
* Compose version update
* Style and other minor fixes
2022-06-09 17:05:01 +01:00
AurelienWebnation a6ede85e81
fix: typo 2022-06-08 18:40:59 +02:00
Dora Ribeiro d49af6a449
ENGDOCS 711 Revisited Compose Install Page (#14838)
Revisiting Compose installation
2022-06-02 18:10:37 +01:00
Dora Ribeiro 1e3ca2faa7
Merge pull request #14857 from dockertopia/ENGDOCS-736 2022-05-31 10:28:13 +01:00
dribeiro fc493ce4d0 Updating Compose Release Notes - Adding 2.6.0 2022-05-30 22:24:22 +01:00
dribeiro 1069bb28bd Updating Compose Release Notes - Adding 2.5.1 2022-05-30 18:04:32 +01:00
Ulrich Pogson 4f3bfc3715
Update code example for pre-existing network 2022-05-30 09:58:02 +02:00
Usha Mandya c43befc48e Update note about the availability of DD4L
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-05-25 14:53:07 +01:00
Heitor Lisboa aced504ad2
fix markdown error
Fixed italic marker
2022-05-22 13:41:29 -03:00
Allie Sadler ca314e1d4e
Merge pull request #14756 from aevesdocker/ENGDOCS-697
updating linux references throughout all docs, to DD
2022-05-18 12:37:34 +01:00
Usha Mandya 7f068d610c
Merge pull request #14732 from glours/hide-compose-completion
hide the compose completion page until it's available for v2
2022-05-18 11:29:07 +01:00
dockertopia 8a085584cf
Updates to the Compose Release Notes (#14722)
* Updates to the Compose Release Notes (from 1.29.2 to 2.5.0)

* Fixing missing bracket in link

* Added reviews feedback

* Minor changes: formatting
2022-05-18 11:03:16 +01:00
Allie Sadler bb2f0178e7 updating linux references to DD 2022-05-17 13:41:07 +01:00
Guillaume Lours fea1b5240e
hide the compose completion page until it's available for v2
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-05-12 17:30:46 +02:00
Allie Sadler f5b05c2e94 fix broken link 2022-05-12 10:11:55 +01:00
Guillaume Lours 59c10d162c
fix display issue on linux install section of Compose
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-05-09 21:35:16 +02:00
Usha Mandya 5534cd211e
Merge pull request #14627 from whatyouhide/patch-1
Fix a typo in deploy.md
2022-05-04 10:10:09 +01:00
Guillaume Lours 57133d978c
fix broken link to install manually the Compose binary on Linux
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-05-03 16:56:11 +02:00
Usha Mandya 30a3385640 Update compose/cli-command-compatibility.md 2022-05-03 15:31:43 +02:00
Usha Mandya dcdd50edbd Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
2022-05-03 15:31:43 +02:00
Guillaume Lours ce0a395f94 update the Compose Linux installation to use package managers
Apply suggestions from code review

Co-authored-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-05-03 15:31:43 +02:00
Guillaume Lours 4848a0d147 merge Compose V2 overview to the Compose index page
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-05-03 15:31:43 +02:00
Andrea Leopardi d4616a7fde
Fix a typo in deploy.md
The "fronted" service in an example was mispelled.
2022-04-27 11:48:00 +02:00
Guillaume Lours e10f19f952
Apply suggestions from code review
Co-authored-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-04-26 17:49:51 +02:00
Guillaume Lours d30117c1d4
clean the docker compose command doc to remove reference to v1 and GA
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-04-25 19:30:40 +02:00
Guillaume Lours a70e6ab243 Update Compose installation for the V2 GA announcement
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-04-25 18:47:37 +02:00
Usha Mandya 669f796938
Merge pull request #14463 from marcopus/patch-1
Update envvars.md
2022-04-08 10:59:23 +01:00
Ulysses Souza 8b6e052eee
Add inline comments section (#14507)
* Add inline comments section

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

* Update compose/compose-file/compose-file-v3.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2022-04-06 16:10:06 +01:00
Usha Mandya 2083fbb63c Fix a crossref to the compose file spec page
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-04-05 12:55:33 +01:00
Usha Mandya db82a1844d
Merge pull request #14416 from usha-mandya/engdocs-602
Move Compose file ref to the legacy node
2022-03-31 19:01:56 +01:00
PeterBParker eef12c06a4
Update compose-file-v3.md
corrected duplicate being verb
2022-03-30 11:55:05 -05:00
Usha Mandya 5636e8e678 Fix broken xrefs, curate compose spec overview
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-03-29 14:37:44 +01:00
Usha Mandya fc28f7560a Add build and deploy docs
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-03-29 12:55:29 +01:00
Marco Marra 43daee99e1
Update envvars.md
Replace underscores with hyphens in container names.
2022-03-29 09:41:08 +02:00
Usha Mandya 1d5af4b2b9 Test: Add Compose spec details to the repo
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-03-21 12:07:21 +00:00
QuantumGhost d0e96b140a
Update compose-file-v3.md
The docs says `deploy` does not work for `docker-compose`, however, the `deploy.resources` do work.

ref: https://sourcegraph.com/github.com/docker/compose@v2/-/blob/pkg/compose/create.go?L511-514
2022-03-01 14:36:42 +08:00
Usha Mandya 0a1c0aebd7
Merge pull request #14022 from Flyingmana/patch-1
add Deprecated warning to --log-level argument
2022-02-25 11:49:26 +00:00
Usha Mandya f4b06da7b4
Merge pull request #14273 from gnumoksha/patch-1
fix(cli-command): handle $DOCKER_CONFIG env var
2022-02-25 11:06:50 +00:00
Usha Mandya 608d1911de
Merge pull request #14299 from ashleyo/patch-1
Update cli-command-compatibility.md
2022-02-24 14:46:43 +00:00
Usha Mandya 3bf0233899
Merge pull request #13958 from andrewsurrey/patch-1
Update networking.md
2022-02-24 14:26:23 +00:00
Ashley Oliver 09d321b014
Update cli-command-compatibility.md
Correct spelling/typos
2022-02-23 15:06:07 +00:00
Tobias Sette 5e58b08078
fix(cli-command): handle $DOCKER_CONFIG env var 2022-02-16 14:34:31 -03:00
jrudel abddcbce76
Move example of symbolic link closer to related text (#14228)
* Move example of symbolic link closer to related text

This is to co-locate the text explaining why a symbolic link might be required with the example of the symbolic link creation. This will make it more clear that the symbolic link example is related to the note immediately above.

* Insert line break prior to example

* Fix indentation of quote block

It now matches the indentation of the instructions code blocks and other quote blocks.
2022-02-11 14:01:16 +00:00
Usha Mandya 8462ac28ee
Merge pull request #14102 from gbtec-markusmeier/patch-1
fix location of compose switch install script
2022-02-11 10:17:47 +00:00
Stefan Scherer bcc2a90f52
Use host port 8000 to avoid conflicts on Monterey
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2022-02-09 13:05:34 +01:00
Kayla Reopelle (she/her) b730e42610
Update ipv6 instructions for 3.x Compose files (#14168)
* Update ipv6 instructions for 3.x Compose files

IPv6 instructions on https://github.com/docker/compose/issues/4958, are compatible with Docker Compose 3.x

* Update code block to use yaml syntax

With @usha-mandya

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

* Update text about using IPv6

By @usha-mandya

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

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2022-02-04 14:03:19 +00:00
Usha Mandya 66d7458008
Merge pull request #14184 from usha-mandya/compose-install-update
Add a link to Compose 2.0 install on Linux
2022-01-31 09:49:03 +00:00
Usha Mandya 6b72333021 Add a link to Compose 2.0 install on Linux
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-01-28 18:50:17 +00:00
Usha Mandya 87dbb07f2c Update the usage of docker-compose cli commands
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-01-28 12:45:52 +00:00
Usha Mandya 221d7a378f
Merge pull request #14178 from prioritize/patch-1
Update build.md
2022-01-28 16:49:52 +05:30
Jared Leach b6b19516d0
Update build.md
This page has a large number of downvotes and I think it's because the confusion of docker-compose --build and docker-compose build --arg. It definitely confused me and made it appear that the instructions contained did not work.
2022-01-27 13:36:47 -08:00
Usha Mandya 78129fe53a
Revert "incorrect download link" 2022-01-18 18:31:34 +05:30
Markus Meier c06bb70eac
fix location of compose switch install script 2022-01-13 15:07:05 +01:00
Ulysses Souza 9514d190c3 Add migration V1 -> V2 info
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-01-11 14:35:05 +01:00
KY-7 f413d25dba
incorrect download link
For example: /download/v2.2.3/ (correct) instead of  /download/2.2.3/ (incorrect)
2022-01-08 14:26:39 +00:00
Daniel Fahlke d8816a5b90
add Deprecated warning to --log-level argument
see https://github.com/docker/compose-cli/issues/1891
2021-12-21 11:05:05 +01:00
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
Andrew eeaada23f5
Update networking.md 2021-12-11 01:16:33 +00: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
Ralph Bisschops 7fed5214cc
Add comments to `wait-for-postgres.sh`
Add additional comment to explain code
2021-05-27 10:07:04 +00: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