Commit Graph

356 Commits

Author SHA1 Message Date
Guillaume Lours b92ebe5fbf
Replace docker-compose calls (#17881)
* use 'docker compose' instead of 'docker-compose' in Swarm documentation

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

* replace old usages of 'docker-compose' by 'docker compose'

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

---------

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-08-08 10:05:39 +01:00
David Karlsson 888b052389 engine: create a section for network drivers
Signed-off-by: David Karlsson <david.karlsson@docker.com>
2023-06-01 13:53:24 +02:00
David Karlsson 5206d4853b engine: call out compose file format used by swarm
Signed-off-by: David Karlsson <david.karlsson@docker.com>
2023-05-31 11:07:33 +02:00
David Karlsson 093181c9e1 engine: add note about swarm usage
Signed-off-by: David Karlsson <david.karlsson@docker.com>
2023-05-31 11:01:43 +02:00
Allie Sadler 7db3dd483e
Engdocs 1374 (#17390)
* ENGDOCS-1374

* fix

* fix
2023-05-23 12:19:18 +01:00
bagratte f24fc7970e Proofread Swarm
Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2023-05-09 07:51:51 +04:00
Bjorn Neergaard 6b0c6de62e
swarm: add context to VXLAN port docs
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
2023-04-06 09:54:10 -06:00
David Karlsson ff1483fb7a
Merge pull request #16596 from neersighted/swarm_ca_rotate_mke
swarm: call out CA rotation as potentially dangerous with MKE
2023-01-27 13:39:39 +01:00
Lakshya Gupta db7ec17c6d
Correct typo (#16600)
* Update swarm-mode.md
2023-01-26 14:22:00 -08:00
Bjorn Neergaard c35d70d5e8
swarm: call out CA rotation as potentially dangerous with MKE
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
2023-01-26 08:31:35 -07:00
Victory Osikwemhe 701123b353
doc: remove instruction of windows container from header 2023-01-11 12:56:58 +01:00
Victory Osikwemhe 1614ac691c
doc: specify the initial gMSA example works only for windows containers 2023-01-11 12:46:34 +01:00
Victory Osikwemhe c31420f0b4
doc: fix grammar error (#16495) 2023-01-11 10:47:21 +00:00
Allie Sadler f956ab6552
Improve alt text on images (#16484) 2023-01-10 16:28:46 +00:00
Sebastiaan van Stijn a7b9985e00
engine: update reference docs (yaml), and fix anchor links
The updated version uses new anchors for flags, so updates are needed
elsewhere to update those anchors.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-01-09 10:29:43 +01:00
David Karlsson 3ea359707d
Merge pull request #16425 from zombieleet/patch-1
doc: specify that `N` should be an odd number
2023-01-04 17:08:16 +01:00
Victory Osikwemhe 0133cf6f68
doc: improve sentence relating to odd number of worker nodes
Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2023-01-04 15:46:28 +01:00
Victory Osikwemhe 90e51e74c9
doc: add documentation for `READY` state 2023-01-04 11:36:40 +01:00
Victory Osikwemhe 682d300d15
doc: specify that `N` should be an odd number 2023-01-04 08:04:23 +01:00
David Karlsson 3fe2d7a0e5
Merge pull request #16234 from zombieleet/service-inspect-patch-1
Use the correct error message when trying to inspect a nonexisting service
2022-11-30 10:18:46 +01:00
Victory Osikwemhe 73ce2ff6c0
Use the correct error message when trying to inspect a nonexisting container 2022-11-28 12:49:52 +01:00
Craig Osterhout 53e81b04b8
remove DD mentions in swarm tutorial (#16158) 2022-11-15 10:04:02 +01:00
NitishKumar06 bdd8eb8dbe Removed the mentioning of docker machine 2022-09-29 22:55:05 +05:30
NishantBanat b6a87b3676
Updated networking.md to remove sent word used twice (#15322)
There was a small error where we see sent sent, so removed one of the sent word. Line 395.
2022-08-09 13:17:56 +01:00
Justin Chadwell fd9fe19061 lint: tidy up ordered list prefixes 2022-07-28 11:27:10 +01:00
Allie Sadler cab9f914bf
ENGDOCS-846 (#15219)
* ENGDOCS-846

* fix broken links

* fix links

* fix broken links

* fix broken links

* fix broken links
2022-07-27 13:26:22 +01:00
Dora Ribeiro adc61b973e
Edit to remove reference to missing image (#15069) 2022-07-08 10:09:47 +01:00
Jared Boone e7be2f9381
Update ingress.md (#15068)
Minor edit
2022-07-06 11:40:30 +01:00
Dora Ribeiro d49af6a449
ENGDOCS 711 Revisited Compose Install Page (#14838)
Revisiting Compose installation
2022-06-02 18:10:37 +01:00
Sebastiaan van Stijn 461c6935c4
fix aligning in some output examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-04-12 11:44:41 +02:00
Mandraenke 0de0cf0f1d
added misssing "driver"
The example for setting the MTU on the swarm ingress network uses the wrong property:

`--opt com.docker.network.mtu=1200`

instead of

`--opt com.docker.network.driver.mtu=1200`
2022-04-06 08:40:20 +02:00
Usha Mandya b5eb52e46a
Merge pull request #13924 from jguady/patch-1
Clarify Advanced Wordpress section
2021-12-17 11:09:43 +00:00
mbehboodian be3e1a6289
Fix typo
Remove unnecessary backtick (`).
2021-12-09 07:06:42 +00:00
JayG 026093444f
Clarify Advanced Wordpress section
I believe this is the intended meaning, otherwise it is unclear where the name wp_db_secret is coming from when referenced as "keeping the same" by wp_db_password
2021-12-01 16:39:56 -07:00
Peter Dave Hello ed135fe151 Update most links to use https by default
Reference:

- #11640
- d405b17ca2

Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
2021-10-12 15:45:57 +08:00
Usha Mandya 0417b58c87 Remove Docker machine from toc, update other references
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-09-27 12:37:02 +01: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
Usha Mandya b3e792e495 Update Docker official images and DVPP references
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-08-19 00:01:01 +01: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
Sebastiaan van Stijn 346a066b68
Desktop: move "docker-for-windows" to "desktop/windows"
Unifying all content related to Docker Desktop to be withing the desktop
directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-14 13:28:15 +02:00
Sebastiaan van Stijn d0bf342e52
Desktop: move "docker-for-mac" to "desktop/mac"
Unifying all content related to Docker Desktop to be withing the desktop
directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-14 13:07:41 +02:00
Sebastiaan van Stijn 3b71231970
engine/swarm: 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:19:56 +02: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
Andrew Grosser c6ef1e671d
Added important disambiguation to swarm mode (#10987)
* Added important disambiguation to swarm mode

This really needs to be added, I had no idea people gave up on docker/swarm because of a misunderstanding, but it's common enough we need to clarify it.

From Docker's public #swarm slack channel:
```
andrew grosser  4:45 PM
Hey @channel I am about to give a talk in San Francisco to a bunch of devops experts about swarm using my ingress and reverse proxy controller https://github.com/sfproductlabs/roo and one of the organizers said swarm was deprecated, is that so? It's so much easier than kubernetes, I can't imagine losing it.
sfproductlabs/roo
A zero config distributed edge-router & reverse-proxy (supporting multiple letsencrypt/https hosts). No dependencies.
Stars
40
Language
Go
<https://github.com/sfproductlabs/roo|sfproductlabs/roo>sfproductlabs/roo | Apr 9th | Added by GitHub
4:46
Is there something we don't know?
james_wells  4:48 PM
As of the most recent official Docker release, no Swarm is still officially part of Docker...  They merely added native support for Kubernetes
andrew grosser  4:49 PM
🙏 Phew, is there an EOL?
4:49
Thanks @james_wells
4:50
I think they going to get the grenade launchers out if I can't answer these questions
james_wells  4:51 PM
Now that is a good question and my guess is that no, there is no plan to remove it, at least before Docker 3.
andrew grosser  4:52 PM
Amazing thx, I have a system that is a startups dream and is personally saving me more than 10x using swarm, so praying it stays
bmitch:docker:  4:53 PM
Classic container deployed swarm is deprecated (I believe). Swarm mode that's integrated into the engine is still being developed by Mirantis with no EOL set.
4:53
So if someone says swarm is deprecated, make sure to ask "which swarm" they are referring to.
andrew grosser  4:54 PM
Ok thanks @bmitch
4:54
Think that's a brand thing we'll need to help change
james_wells  4:56 PM
@bmitch I am not sure I understand what you are sayin there.  Could you please explain the differences
bmitch:docker:  4:56 PM
See the disambiguation section: https://hub.docker.com/r/dockerswarm/swarm
james_wells  4:57 PM
Excellent.  Thank you sir
andrew grosser  5:02 PM
Thanks
bmitch:docker:  5:02 PM
See also this link where they are getting ready to archive the standalone swarm, aka classic swarm. https://github.com/docker/classicswarm/issues/2985#issuecomment-640486361
justincormackjustincormack
Comment on #2985 Why have all issues been closed?
The vast majority of issues were from 5 years ago when it was being actively developed, and the recent ones were all mistakes for swarmkit, other than some issues I resolved. Many were issues in components or Moby or other software and may be resolved. It is GitHubs (reasonable) recommendation that you close issues and PRs before archiving a repository so that people know they are not being worked on, and I was also looking to see if anyone came forward to say that they were still working on things or, indeed, actively using Swarm Classic.
<https://github.com/docker/classicswarm|docker/classicswarm>docker/classicswarm | Jun 8th | Added by GitHub
james_wells  5:08 PM
That is really unfortunate...  Kubernetes is simply too expensive IMNSHO, Swarm is nice and lightweight.
andrew grosser  5:08 PM
Both the different swarms point to the same point in the documentation in the disambiguation @bmitch
bmitch:docker:  5:09 PM
Swarm mode, aka swarmkit is alive and well.
andrew grosser  5:10 PM
Whoa I can see why they were confused
bmitch:docker:  5:10 PM
If you type docker swarm init you are not running classic swarm
andrew grosser  5:11 PM
Can someone inside docker add this to the swarm docs page? I think it's important
5:12
I think something talking about 2014 was EOLd but this is still current and alive would help.
bmitch:docker:  5:12 PM
Docker themselves isn't maintaining it, that team went to Mirantis, so someone over there would need to submit the PR
andrew grosser  5:12 PM
OK, could I?
bmitch:docker:  5:13 PM
Docs are in GitHub
andrew grosser  5:13 PM
Thanks
```

* Minor edit to the wording to clarify the diff

* Minor update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-03-25 16:03:11 +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
zori 398d77002d
Fix typo in note for "create a new swarm" 2020-12-01 14:57:42 +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 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 c119ed174e
Use https:// for links and examples
Found these using `http://[^lp10\*`<][^o]` (to exclude "localhost" and IP-addresses)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-13 12:09:11 +02:00