Commit Graph

1973 Commits

Author SHA1 Message Date
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
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
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
Geetha Rangaswamaiah 77b7b73652 Fix compose docs grammatical errors 2020-08-06 12:49:26 +05:30
Melanie Kwon f256ba065b
Update quickstart Django example
Updating example from Django 2.x to Django 3.x
2020-07-31 08:49:41 -07:00
Usha Mandya e6b1d671cb
Merge pull request #11116 from kaden-weber/patch-1
Update django.md
2020-07-22 13:41:38 +01:00
Usha Mandya 675bdedd1f
Add info about the Expose command (#11137) 2020-07-15 12:36:51 +02:00
Vemuluru Venkata Sri Harsha 39fe7accba
Update gettingstarted.md (#11094)
* Update gettingstarted.md

1. Flask app was running in the wrong port.
2. 5000 port was not exposed in Dockerfile

* Update gettingstarted.md

mistook Redis port to flask port.
2020-07-13 17:06:02 +02:00
Kaden Weber 80b4f06fa2
Update django.md
typo
2020-07-09 10:55:44 -05:00
Usha Mandya 991da00bf7
Merge pull request #11021 from IMMORTALxJO/patch-1
Fixed typo in tmpfs example index.md
2020-07-07 16:26:10 +01:00
Ulysses Souza 262aa4a1e3
Post docker-compose 1.26.2 (#11100)
* Post docker-compose 1.26.2

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

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-07-07 10:20:29 +01:00
Jason C 7e9e551fb8
Update startup-order.md 2020-07-06 01:58:18 -07:00
David Florness f89bbe13ed
Fix grammar (#11072) 2020-07-02 09:33:54 +01:00
Usha Mandya 9031d87295
Update to use lowercase 2020-07-01 16:58:28 +01:00
Usha Mandya ff1578ba9d Update image push reference 2020-07-01 16:30:02 +01:00
Ulysses Souza 7b70c20f1f
Bump docker-compose 1.26.1 (#11068)
* Bump docker-compose 1.26.1

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

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-07-01 15:21:33 +01:00
Usha Mandya e7899d34ed
Merge pull request #7349 from alioguzhan/patch-1
rename psycopg2 to psycopg2-binary
2020-07-01 13:59:03 +01:00
Alan Bondarchuk ea11c50410
Add missing space (#11061) 2020-06-30 10:32:22 +01:00
Sebastiaan van Stijn e3b9c741d0
Merge pull request #10774 from BeniRupp/patch-1
Add description for unless-stopped restart policy
2020-06-25 11:11:49 +02:00
Aleksandr Prusov 1b25464e65
Fixed typo in tmpfs example index.md
tmpfs example has incorrect yaml syntax
2020-06-22 10:37:54 +03:00
Aravind fa4b25cf64
Update to Posgtres instructions (#10982)
### Background
Newer upstream PostgreSQL Docker images, now require a password for use. If you were previously using passwordless access to a PostgreSQL DB, it will likely fail with an error.

This linked GitHub issue showcases the error: 
https://github.com/docker-library/postgres/issues/681

### Solution
The postgres docker page gives instructions on how to use the new image : https://hub.docker.com/_/postgres

There seems to be two different options we can take here :

Option 1 - Implement a password using the environment variable
Option 2 - Revert back to old behavior of having no password requirement

### Thoughts
Based on the team members remark it looks like increased security was the major reason for this breaking changing happening in a minor update.  Refer to this comment : https://github.com/docker-library/postgres/issues/681#issuecomment-586517154

As such I opted to use Option 1 here in this change as increased security of a DB is generally a win for every one in most cases.
2020-06-12 11:23:02 +01:00
Daniel Martinez Sarta 5909058694
Fix Typo. (#10990)
verison -> version
2020-06-12 10:52:41 +01:00
Sebastiaan van Stijn 36e483169d
compose-file: document additional changes in the 3.8 schema (#10980)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-12 10:51:35 +01:00
Ulysses Souza ce973f4e98
Post 1.26.0 release updates (#10948)
* Post 1.26.0 release updates

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

* Minor style edits

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-06-03 17:09:29 +01:00
Sebastiaan van Stijn 3abbecd92d
Merge pull request #10897 from DaleSeo/patch-1
Correct image for db service
2020-06-02 13:26:38 +02:00
ticalcster 5c5bbfb624
fixed max_replicas_per_node example (#10711)
The example for max_replicas_per_node was not inside the placement dict.
2020-05-29 17:12:29 +01:00
Dale Seo 568a163b85
Correct image for db service 2020-05-26 22:28:04 -04:00
Beni Rupp 4d5c70525e
Add description for unless-stopped restart policy 2020-05-08 08:23:06 +02:00
Sebastiaan van Stijn 9f4db87055
compose: add WordPress example to TOC
Also removes links to individual examples, instead linking
to the "compose samples" page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-28 14:35:50 +02:00
Sebastiaan van Stijn 0f3caaca6a
compose: use relative markdown links
Unfortunately, the only reliable way to create internal links
is to use relative links to other Markdown files. This does
match the way links on GitHub work, but makes it harder to
create these links.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:10 +02:00
Sebastiaan van Stijn 3caa2cab82
compose-file: add some options that were missing in changes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-21 20:57:16 +02:00
Sven Dowideit d5e7a26efe
Mention Docker 19.03 and its compose file version - and add max_replicas_per_node
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2020-04-17 08:49:33 +02:00
Ulysses Souza dee187c282
Update docker-compose release notes for 1.25.5 (#10643)
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-04-16 11:23:23 +01:00
Young Jin Ahn c36fb459e1
update postgres initialization for compose/django.md (#10624)
* update postgres initialization for compose/django.md

* omitted code blocks with postgres ports & comments
2020-04-16 10:07:03 +01:00