Commit Graph

1682 Commits

Author SHA1 Message Date
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
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