Commit Graph

331 Commits

Author SHA1 Message Date
Aaron Korte
ddc1e906db Reorder entries so M shows up before N. (#15789)
Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2022-09-30 15:25:52 +02:00
CrazyMax
561118ec5b rename docs repository
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-29 11:07:53 +02:00
Usha Mandya
89ba837e06 Merge pull request #15767 from NitishKumar06/Nitish/15743
Broken link updated in the compose build file
2022-09-28 12:26:41 +01:00
NitishKumar06
c8f29fc13d Broken link updated in the compose build file 2022-09-28 16:32:11 +05:30
CrazyMax
d775c8a6bf build: multi-stage builds
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-15 13:37:37 +02:00
CrazyMax
4bff4740d0 build: customizing builds section
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-15 12:32:52 +02:00
bragov4ik
7b1551532e Typo in long syntax section in compose spec
Description of code snippet in long syntax example of [secrets](https://docs.docker.com/compose/compose-file/#secrets) states that a name of a secret file is set to `server.crt` whereas in the snippet it is configured to `server.cert`.
2022-09-04 21:37:20 +03:00
Dockertopia
56433afce6 Apply suggestions from code review
Minor edits for clarification
2022-09-01 17:02:21 +01:00
Milas Bowman
cf142d7bd4 compose: spec typo/clarity fixes
From Dora in code review

Co-authored-by: Dockertopia <103652162+dockertopia@users.noreply.github.com>
2022-09-01 11:57:06 -04:00
Milas Bowman
2241597c38 compose: fix link references
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2022-09-01 10:19:39 -04:00
Milas Bowman
3518db454f compose: merge latest spec changes
* tmpfs.mode: https://github.com/compose-spec/compose-spec/pull/252
* build.tags: https://github.com/compose-spec/compose-spec/pull/255
* env var secrets: https://github.com/compose-spec/compose-spec/pull/257
* build.platforms: https://github.com/compose-spec/compose-spec/pull/267

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2022-09-01 09:55:24 -04: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
Justin Chadwell
ad45d2d936 lint: tidy spaces inside spans 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
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
CrazyMax
5088f2d82b fix redirects
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-07-13 18:02:43 +02: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
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
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
Heitor Lisboa
aced504ad2 fix markdown error
Fixed italic marker
2022-05-22 13:41:29 -03:00
Allie Sadler
f5b05c2e94 fix broken link 2022-05-12 10:11:55 +01: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
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
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
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
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
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
shokkunrf
3d64de6303 Fix a typo by adding a quote 2021-06-09 20:07:50 +09:00
Paul Townsend
fea0d8fea8 Minor grammar fix ("an unified" -> "a unified") 2021-06-04 12:35:51 +01:00
unknown
9463f35e56 removed version 1 from composefileref 2021-05-07 11:49:37 -05: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
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
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
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