Commit Graph

1525 Commits

Author SHA1 Message Date
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
Charles Chan 68bda871de
Improve example for setting environment variables (#10594) 2020-04-14 11:30:03 +01:00
Sebastiaan van Stijn 7cdc66fba9
compose: fix highlighting on startup-order page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-11 16:07:13 +02:00
Sebastiaan van Stijn d813acb6e1
Engine: reorganize install topic
- Move getting started overview to /get-started/overview/
- Move engine installation files under /engine/
- Redirect the top-level /install/ to /get-docker/
- Updated titles in left-hand navigation
- Added back some pages to the navigation that were
  currently not included.
- Reduce some steps in the installation pages
- Move devicemapper prerequisites to the devicemapper
  storage driver page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-06 10:50:28 +02:00
Sebastiaan van Stijn 331554f4b3
Fix various links that were generating URLs with `.md` (#10548)
* Fix incorrect links in compose section

there's a bug causing wrapped links to not work, and replacing
some links to point to the .md file, so that IDE's can check
if the anchors are valid. Also replaced some links to point
to their new location.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* engine/swarm: update links

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Fix various broken links

There's a bug in the "jekyll-relative-links" plugin that causes wrapped links to not work.
Also replacing some links to point to the .md file, so that IDE's can check if the anchors
are valid. Finally, replaced some links to point to their new locations, so that users don't
get redirected..

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-01 12:05:50 +01:00
Hector S 4a3f0a68c4
Fixing bad url related to #10517 2020-03-25 22:37:34 +01:00
Sebastiaan van Stijn 93e24fe60e
Move release notes inside each product's section
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-18 14:09:17 +01:00
Usha Mandya 30ea7f2562
Merge pull request #10467 from thaJeztah/update_compose_file_reference
Rewrite and cleaning-up compose file reference
2020-03-17 15:22:13 +00:00
Sebastiaan van Stijn 14bbe621e5
Update markdown language hints to work with "rouge"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 14:49:51 +01:00
Sebastiaan van Stijn 8a0f1f0c67
compose-file: disable indexing for compose file V1 format
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 14:15:28 +01:00
Sebastiaan van Stijn 02a36c2735
compose-file: fix constraint examples, and consistent format
Constraints don't accept spaces around `==` / `!=`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 14:15:22 +01:00
Sebastiaan van Stijn f15a3a1c4b
compose-file: use JSON notation for entrypoint example
This format is also supported by YAML, and similar to
how it's used in the Dockerfile.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 14:15:20 +01:00
Sebastiaan van Stijn 4cf38f289f
compose-file: reformat and rewrite some tips/notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 13:59:44 +01:00
Sebastiaan van Stijn dc2ae46f92
compose-file v2: re-order topics to be the same as v3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 13:31:43 +01:00
Sebastiaan van Stijn fad62a6e9d
compose-file: add missing code-hints, sync formatting between versions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 13:31:36 +01:00
Sebastiaan van Stijn 73c9649967
Move "Glossary" from top nav to "reference" section
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-14 09:10:38 +01:00
hochan222 43de808c91
maybe version not update
hochan@hochan-node:~/Desktop/pfc/dockercompose$ sudo docker-compose up --build
ERROR: Version in "./docker-compose.yml" is unsupported. You might be seeing this error because you're using the wrong Compose file version. Either specify a version of "2" (or "2.0") and place your service definitions under the `services` key, or omit the `version` key and place your service definitions at the root of the file to use version 1.
2020-03-11 04:37:56 +09:00
charliemenke bf99b1999c
Update rails.md (#10271) 2020-02-12 10:14:56 +00:00
TribalNightOwl b344d1beb3
Fix missing comma (#10226)
* Fix missing comma

* Improved way to describe boolean values in env

Great idea @dHannasch!
2020-02-11 14:21:50 +00:00
Sebastiaan van Stijn d4ead1b120
Remove "bundle" subcommand and support for DAB files
Deploying stacks using the "Docker Application Bundle" (`.dab`) file
format was introduced as an experimental feature in Docker 1.13 /
17.03, but superseded by support for Docker Compose files in the CLI.

With no development being done on this feature, and no active use of the file
format, support for the DAB file format and the top-level `docker deploy` command
(hidden by default in 19.03), will be removed from the CLI, in favour of
`docker stack deploy` using compose files.

This patch removes documentation for the `docker-compose bundle` subcommand,
which was used to convert compose files into DAB files (and given the above,
will no longer be needed).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-22 15:34:58 +01:00
Andrey Kuchuk 5586e5e0da update compose install md (#10146)
make install as a container better for copy-paste
2020-01-22 13:42:09 +00:00
Daniel Naftalovich 8b05462660 Missing link to Getting Started w/ Compose (#9991)
* Missing link to Getting Started w/ Compose
* Style edits
2019-12-10 08:13:31 +00:00
lena-larionova c620742964
turned deprecated notes into warnings (#9912)
Signed-off-by: Lena Larionova <lena.larionova@docker.com>
2019-11-19 15:24:22 -08:00
KoryKessel-Docker 2ce3996912 Push of Compose xref edits to public. 2019-11-14 14:40:19 +00:00
lena-larionova 343ab4e8bb
Fixing Hub and DTR broken links (#9839)
* fixing Hub and DTR broken links

Signed-off-by: Lena Larionova <lena.larionova@docker.com>

* Fixing another link

Signed-off-by: Lena Larionova <lena.larionova@docker.com>
2019-11-12 13:22:30 -08:00
Pierre Kancir 34b1a87cf2 Compose: index.md (#9814)
Update broken links
2019-11-07 07:56:40 -08:00
lena-larionova 54ca6a523b
Fixing glossary links (#9812)
Signed-off-by: Lena Larionova <lena.larionova@docker.com>
2019-11-06 11:00:13 -08:00
lena-larionova 07b6c614e4
Removed references to examples that no longer exist (#9781)
Signed-off-by: Lena Larionova <lena.larionova@docker.com>
2019-10-31 13:45:49 -07:00
Usha Mandya 2f85f33526
update compose v2 file ref (#9595) 2019-10-09 09:37:08 +01:00
Psy-Q 25218530a6 Stop referring to deprecated 'links' feature, replace with 'depends_on' where appropriate (#9480) 2019-09-26 16:37:02 +01:00
Sebastiaan van Stijn cf8215ec58
Update compose-file reference for sysctls
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-23 16:28:40 +02:00
Douglas Naphas 3512d96117 Make minor grammar corrections (#9471) 2019-09-19 10:50:33 +01:00
WeJie fbc379d183 Fix typo (#9388) 2019-09-17 16:27:40 +01:00
WeJie cf1f53a637 Remove duplicated doc - "depends_on" (#9401) 2019-09-09 15:59:15 -07:00
Peter Nagy 83ad9157d6 Adds `--no-interpolate` to `docker-compose config` (#8409)
* Adds `--no-interpolate` to `docker-compose config`

As per https://github.com/docker/compose/pull/6368

* Fix typo
2019-09-06 11:58:27 +01:00
joaocns 7a0091f9c2 fix broken link to features (#9295) 2019-08-22 15:18:03 -07:00
Sandro fafc6dd1de Link directly to resources section (#9200) 2019-08-16 11:44:19 +01:00
Meng Ye de44061a7d fix common use cases broken link (#9112) 2019-07-23 09:45:36 -07:00
Olli Janatuinen 500b9b166d Included npipe to documentation (#7427) 2019-07-23 08:58:41 -07:00
ollypom 9bafc04bcc
Fixed Conflict 2019-07-08 17:00:49 +00:00
Sebastiaan van Stijn 25cab04026 docker-compose: change overview from /compose/overview to /compose/ (#8939)
Move compose/overview to compose/
2019-07-08 11:40:00 +01:00
Alastair Smith 87db538a34 Merge remote-tracking branch 'upstream/master' 2019-06-24 11:22:13 -05:00
Adrian Plata f2f41723fb
fixing missing word 2019-06-20 10:54:27 -07:00
Adrian Plata 8c46d71655
Adding a note on possible version errors 2019-06-20 10:53:49 -07:00
Adrian Plata b0a9f6f3b6
Merge branch 'master' into patch-1 2019-06-20 10:48:48 -07:00
Maria Bermudez 6c1f2dfe26
Update URLs to Microsoft images
Minor edits
2019-06-19 08:34:06 -07:00