Commit Graph

54 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 0035868d2b
Engdocs 1428 (#17506)
* Desktop meta descriptions

* compose meta descriptions

* checks
2023-06-09 08:39:23 +01:00
Anton Makarenko a95fcaeb3d
Update https://docs.docker.com/compose/networking/ (#16902)
* Update networking.md

* Update compose/networking.md

Co-authored-by: Guillaume Lours <705411+glours@users.noreply.github.com>

---------

Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com>
Co-authored-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-03-27 15:10:55 +01:00
Allie Sadler 326cb37213
spec-split-fix (#16941)
* spec-split-fix

* fix broken link
2023-03-22 12:53:16 +00:00
Allie Sadler 855cda4011
Spec split (#16740)
* split spec

* spec split

* trial branch

* fix

* branch update

* landing page

* add description

* add description

* update file path

* tweak

* fix build

* split spec

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* spec split

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* trial branch

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* fix

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* branch update

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* landing page

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* add description

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* add description

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* update file path

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* tweak

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* fix build

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* missing new line

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

* first batch of fix links

* second batch of link fix

* update toc

---------

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-03-22 12:00:04 +00:00
Mats Luspa b95bbd15b5
Typo (#16711)
In row 55 to 57 it is written following:
Within the `web` container, your connection string to `db` would look like
`postgres://db:5432`, and from the host machine, the connection string would
look like `postgres://{DOCKER_IP}:8001`.
As the container is running postgres on port 5432 the it should be `postgres://{DOCKER_IP}:5432` in the end of that sentence.
2023-02-10 11:52:52 +00:00
Allie Sadler d165097c0d
ENGDOCS-1166a (#16641) 2023-01-31 15:27:52 +00:00
Allie Sadler 3a09816b5c
Engdocs 1067a (#16628)
* updated toc

* move env-file.md

* update env-file.md content

* move envvars-precedence.md

* change envvars-precedence content

* move envvars.md

* change content of envvars.md

* move and rename environment-variables.md

* change content for set-environment-variables.md

* fix links

* format fix
2023-01-30 11:27:59 +00:00
Allie Sadler f979ff4405
ENGDOCS-1064 (#16443)
* ENGDOCS-1064

* fix broken links

* fix broken links

* Apply suggestions from code review

Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>

Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2023-01-09 13:20:06 +00:00
Dora Ribeiro 72a3a45c0e
Replacing v1 syntax (#15185)
* Replacing v1 syntax
2022-07-26 18:08:28 +01:00
Ulrich Pogson 4f3bfc3715
Update code example for pre-existing network 2022-05-30 09:58:02 +02:00
Usha Mandya 3bf0233899
Merge pull request #13958 from andrewsurrey/patch-1
Update networking.md
2022-02-24 14:26:23 +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
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
TheDarkTron 150b6dff04
Added space to fix layout 2021-10-28 12:48:59 +02: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
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
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
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
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
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
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
Geetha Rangaswamaiah 77b7b73652 Fix compose docs grammatical errors 2020-08-06 12:49:26 +05: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
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 4c95d161ca.
2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 14080c18bd.
2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 14:47:31 -07:00
Sascha Egerer ba950b14b6 Fix some broken links 2018-06-15 14:58:07 -07:00
Thad Guidry f1ec5d916a Added mention of new Custom Network naming since 3.5 (#6747) 2018-05-24 12:26:05 -07:00
Sascha Egerer ec789e4ff3 Fix links to compose-file in networking (#6752) 2018-05-24 09:34:54 -07:00
Misty Stanley-Jones d14a9f96fd
Doc that for 2.1+, overlay networks are attachable (#5967) 2018-02-08 15:58:45 -08: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
Wang Jie a72e278983 Update networking.md 2017-10-18 19:14:06 -07:00
Danny Tracey c4da71c5fa docs change for compose/networking (#3094)
* docs change for compose/networking

Without this clarification, I was tripped up for a while because it wasn't easy to understand why containers were getting connection refused errors on ports defined for the host, not the container.
2017-05-10 11:26:29 -07:00
John Harris f179037853 Clarify Swarm vs swarm mode with compose capabilities (#3008) 2017-04-23 11:44:11 -05:00
Krassimir Valev a6ee7cfefe Fixed networks identation issues (#2989) 2017-04-21 23:58:05 -07:00
Constanze Kratel 0cdec66639 Update composefile versions and quotes in examples
Changed version from 2 to 3, updated quotation marks to match example, changed front and back to frontend and backend.
2017-04-18 13:43:57 -07:00
Misty Stanley-Jones fb7c73908b Update the styleguide (#2332)
* Update the styleguide

Also normalize admonition titles with the colon outside the bold.
2017-03-15 09:46:30 -07:00
Jozef 3083031907 Update networking.md
Clarify compatibility of "networks" with more recent versions of compose.
2017-02-18 20:16:35 +01: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
Adrien Duermael 8fa5f3a5de absolute links to docs.docker.com are now relative links
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-11-01 17:01:41 -07:00