Commit Graph

49 Commits

Author SHA1 Message Date
Allie Sadler 013f5331ca
compose freshness (#17889)
Co-authored-by: aevesdocker <alliesadler@f693mt7fh6.home>
2023-08-10 08:45:02 +01:00
Allie Sadler 8e16fb9373
keywords (#16691) 2023-02-08 14:42:21 +00:00
Allie Sadler d165097c0d
ENGDOCS-1166a (#16641) 2023-01-31 15:27:52 +00:00
Allie Sadler fb95c6bc75
Engdocs 1019 1021 (#15826)
* updated getting started guide

* toc update

* rearranging

* fix broken link

* fix broken links

* naming tweaks

* links fix

* add icon links
2022-10-21 09:55:54 +01:00
Dockertopia ef28f705dd
Install page improvement based on feedback (scenario2) (#15494)
* Install page improvement based on users and PM feedback
* Exploring a second scenario deriving from additional feedback
* Review feedback
2022-09-05 10:35:30 +01:00
dockertopia ceb3ba021f Adding redirect to compose index 2022-08-22 15:36:45 +01:00
Usha Mandya ff9a439940
Merge branch 'master' into patch-1 2022-08-10 11:30:42 +01:00
Dora Ribeiro 72a3a45c0e
Replacing v1 syntax (#15185)
* Replacing v1 syntax
2022-07-26 18:08:28 +01:00
Dora Ribeiro d49af6a449
ENGDOCS 711 Revisited Compose Install Page (#14838)
Revisiting Compose installation
2022-06-02 18:10:37 +01:00
Allie Sadler bb2f0178e7 updating linux references to DD 2022-05-17 13:41:07 +01: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
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
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
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 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 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
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
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
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
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
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 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
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
Sohrab Shahinfar b6cace9640
update docker-compose version
update docker-compose.yml to version 3
2020-08-15 15:32:27 +04:30
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 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
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
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
KoryKessel-Docker 2ce3996912 Push of Compose xref edits to public. 2019-11-14 14:40:19 +00:00
Pierre Kancir 34b1a87cf2 Compose: index.md (#9814)
Update broken links
2019-11-07 07:56:40 -08:00
Kornel Dubieniecki 3215345bd7
Remove deprecated `links` feature 2019-10-26 12:33:02 +02:00
joaocns 7a0091f9c2 fix broken link to features (#9295) 2019-08-22 15:18:03 -07:00
Meng Ye de44061a7d fix common use cases broken link (#9112) 2019-07-23 09:45:36 -07: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
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
2018-01-25 17:37:23 -08:00
Victoria Bialas 6dd38de6c8 Added better links to Compose overview docs (#4074)
* added better links to Compose overview docs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed drupal samples link per feedback

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-02 09:59:12 -07:00
Victoria Bialas e845620aaf fixed nav menus to surface Compose file reference, changed links to several manuals to overviews
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-16 18:06:05 -08:00
Dan Shumaker d3bec385f1 Update index.md 2016-12-13 12:06:37 -05:00
Gaetan 2ea564166d fix type of keywords entry in frontmatter (in /compose/ dir) (#481)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-07 13:18:56 -08:00
John Mulhausen 558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438)
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00
Misty Stanley-Jones 1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
2016-11-04 13:33:29 -07:00
Gaetan 8bb4d6226a fix more frontmatter keywords values (#439)
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
Aleksandar Nikolić 18499881e5 Update index.md
Fix typo.
2016-10-23 20:12:47 +02:00
Misty Stanley-Jones d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones 701f170a21 Move docker-hub docs to docker-hub subdirectory 2016-09-29 10:38:52 -07:00
Misty Stanley-Jones 7629f462d5 Moved compose docs to compose subdirectory 2016-09-28 14:52:24 -07:00