Commit Graph

82 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
f6adc80d9a remove examples for ENV key value without '='
The `ENV key value` form can be ambiguous, for example, the following defines
a single env-variable (`ONE`) with value `"TWO= THREE=world"`:

    ENV ONE TWO= THREE=world

While we cannot deprecate/remove that syntax (as it would break existing
Dockerfiles), we should reduce exposure of the format in our examples.

Also updating some code-blocks that were missing language-hints

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-23 15:16:35 +02:00
Steven
a8a846caca Update network-tutorial-overlay.md 2020-07-30 01:17:51 +05:00
Usha Mandya
dddb1d445d Merge pull request #11141 from usha-mandya/11035-patch
Remove Enterprise references
2020-07-21 14:54:57 +01:00
Usha Mandya
1c853406e9 Remove Enterprise references 2020-07-21 14:47:01 +01:00
Usha Mandya
df563bd043 Remove links to deprecated articles 2020-07-16 15:18:01 +01:00
d-tork
2693610fc7 correct typo in bash command 2020-06-17 21:00:32 -04:00
Ragland Asir
c270517181 Update Networking overview file (#10875)
* Update Networking overview file

I feel it's better to change the current title (which is just ["Overview"](https://docs.docker.com/network/)) to "Networking"

This will add more meaning and also be more consistent with other overview pages such as [Orchestration](https://docs.docker.com/get-started/orchestration/) and [Develop with Docker](https://docs.docker.com/develop/)

* Updated the title to match the toc entry

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-05-26 11:10:11 +01:00
Sebastiaan van Stijn
dc1f9f7b4d network: use relative markdown links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:39 +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
Maxim Orlov
4bb170e535 Remove incorrect difference between user-defined and default bridge (#10320)
* Remove incorrect difference between user-defined and default bridge

This PR removes the first bullet point from the list differences between user-defined bridge networks and the default bridge network:

[User-defined bridges provide better isolation and interoperability between containerized applications](https://docs.docker.com/network/bridge/#differences-between-user-defined-bridges-and-the-default-bridge).

The default bridge network, similar to user-defined bridges, opens all ports to other containers and allows for inter-container communication by default. This is elaborated and demonstrated in #8973. Other relevant issue: #8437.

* Remove mention of previous bullet point

* Added isolation advantage of user-defined over default network
2020-02-25 17:30:41 +00:00
Sebastiaan van Stijn
6de87b1476 Move classic overlay networking topic to swarm standalone section (#10326)
* Move classic overlay networking topic to swarm standalone section

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

* Redirect old "getting started with overlay networks" to current page

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-20 12:16:04 +00:00
Michael Ziegler
a9b5a33dd0 improve description of iptables design, add notes about securing Docker hosts (#10263)
* improve description of iptables design, add notes about securing Docker hosts

* fix typo

* simplify a sentence

* fix chain name

* more minor changes

* add notes about the FORWARD chain policy

* shorten section on --ip

* rephrase section title
2020-02-18 17:19:45 +00:00
Terry Burton
d57f57426b Update overlay.md
Closes https://github.com/docker/docker.github.io/issues/8038.
2020-02-01 15:51:52 +00:00
Dawn W Docker
f819435149 removed Enterprise sections 2020-01-09 13:31:42 -08:00
Carlton Caven
910e8186d3 change link from ucp 2.2 to layer 7 (#9773)
* change link from ucp 2.2 to layer 7

link routes to old documentation http routing mesh is now interlock/layer 7

* Updated Sticky Sessions
2019-11-13 15:58:00 +00:00
lena-larionova
718eb9b08e fixing typos (#9787)
Signed-off-by: Lena Larionova <lena.larionova@docker.com>
2019-11-01 11:05:51 -07:00
ada mancini
e1034b60ed update iptables=false documentation (#9482)
make it clearer that this is not intended for end-users
2019-09-26 16:42:12 +01:00
Jeff Anderson
607de352f2 call out ext_if as a placeholder in the example (#9070) 2019-08-19 15:25:33 +01:00
Mayank Jethva
0c1974b06a Update network-tutorial-macvlan.md (#8453) 2019-07-24 15:29:19 -07:00
ollypom
c39ba281fd Synced Docs Public Master with Docs Private Master 2019-07-19 11:02:28 +00:00
Sebastiaan van Stijn
3b904e7a9f Merge pull request #8582 from thaJeztah/host_networking_nits
Host networking touch-ups
2019-07-08 20:08:48 +02:00
Dawn W Docker
f4dde18e07 branding changes
Signed-off-by: Dawn W Docker <dawn.wood@users.noreply.github.com>
2019-06-11 14:37:45 -07:00
D. Domig
8b8107e3b7 Fix typos (#8650) 2019-05-22 11:56:34 -07:00
Sebastiaan van Stijn
deb202f6c0 Host networking touch-ups
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-03 11:47:40 +02:00
Mayank Jethva
15e80ea3a7 Update overlay.md 2019-02-12 11:19:24 -07:00
Maria Bermudez
d2cb263bd1 Merge pull request #6995 from javabrett/httpsProxy
Include httpsProxy key/value in sample client config.json
2019-01-31 16:49:34 -08:00
Comical DERSKEAL
8924d2a9b3 Update links.md 2019-01-29 15:39:36 +01:00
Istvan Tapai
dd068472d6 fix typo 2019-01-19 05:09:27 +01:00
paigehargrave
0dab4ade68 Merge branch 'master' into name-change-for-Docker-Desktop 2019-01-14 11:14:48 -05:00
paigehargrave
f301faa09c Update network-tutorial-macvlan.md 2019-01-11 14:42:19 -05:00
paigehargrave
6238726738 Update network-tutorial-host.md 2019-01-11 14:03:25 -05:00
paigehargrave
34a1aea420 Update host.md 2019-01-11 13:54:42 -05:00
Brett Randall
58beec2d76 Included httpsProxy key/value in sample client config.json.
Signed-off-by: Brett Randall <javabrett@gmail.com>
2019-01-06 16:47:54 +11:00
Bill Grant
b759eb9c60 unknown flag: --join
Running: 
```
$ docker swarm --join --token <TOKEN> \
  --advertise-addr <IP-ADDRESS-OF-WORKER-1> \
  <IP-ADDRESS-OF-MANAGER>:2377
```
throws the following error

```
unknown flag: --join
See 'docker swarm --help'.

Usage:	docker swarm COMMAND

Manage Swarm

Commands:
  ca          Display and rotate the root CA
  init        Initialize a swarm
  join        Join a swarm as a node and/or manager
  join-token  Manage join tokens
  leave       Leave the swarm
  unlock      Unlock swarm
  unlock-key  Manage the unlock key
  update      Update the swarm

Run 'docker swarm COMMAND --help' for more information on a command.
```

The command in the PR returns

```
This node joined a swarm as a worker.
```
2018-12-31 10:46:26 -05:00
Anne Henmi
add53d7ee0 Merge pull request #7611 from danial-k/patch-1
Added missing word in macvlan.md
2018-12-26 10:08:23 -07:00
gobold1979
92cfec0600 Numbers were confused
In the tutorial, you connect to alpine1 (ONE!), do some stuff, can't ping alpine2 and I guess the author was confused at this point because immediately after not being able to ping alpine2 comes detaching from the one you're connected to and that's alpine1.
2018-12-14 22:55:12 +01:00
Maria Bermudez
4bdcbf8ae9 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-10 12:41:24 -08:00
Damian Łysiak
395557124d Update network-tutorial-macvlan.md 2018-11-22 22:07:58 +01:00
Jeffrey Morgan
ca4ffb1ee2 Merge branch 'master' into consolidation-changes 2018-11-14 18:30:02 -05:00
Jeffrey Morgan
d15739c5e7 Merge branch 'master' into consolidation-changes 2018-11-14 18:29:09 -05:00
WeJie
5215b1b580 Update network-tutorial-macvlan.md
Fix typo
2018-11-13 16:21:52 +08:00
danial-k
8d3ebeeb1d Added missing word in macvlan.md 2018-11-04 05:33:14 +00:00
Jeffrey Morgan
ca466a55ed Rename Docker Store and Docker Cloud - WIP 2018-10-04 19:41:32 -04:00
Maria Bermudez
72dd14e450 Merge pull request #7400 from bpfoster/patch-1
Fix overlay network tutorial node names
2018-10-02 17:57:56 -07:00
Anne Henmi
1eb8514229 Merge pull request #7328 from trapier/swarm-service-node-label-constraints
fix swarm service constraint examples. Ready per @trapier
2018-09-26 08:53:48 -06:00
Ben Foster
364f6fea30 Replace references to master with manager
There were two places where the node was called 'master', the rest it was called 'manager'
2018-09-20 13:13:08 -04:00
Trapier Marshall
64279e87a6 fix swarm service constraint examples
1. Be more specific about what happens when constraints aren't satified.
    2. There is no `--global`.  Also addressed in network/overlay.md.
    3. Label constraints do not match node labels without `node.label` prefix.

AFAIK neither 2 nor 3 have ever been correct

testedon: 17.06.2-ee-16
2018-09-06 12:49:45 -04:00
Stefan Auer
f3d628ad29 Update network-tutorial-overlay.md 2018-09-05 12:26:45 +02:00
outofthisworld
84faae3b0d Update bridge.md
Fix typo front-end to back-end which caused some confusion.
2018-07-23 11:15:54 +12:00
adshmh
7ee5554905 Update network-tutorial-host.md
- Modify the `docker run` command to remove the unnecessary flags "-i" and "-t". 
- Add a short description for the "--rm" option.
- Remove the "docker container rm" command which seems redundant due to "--rm" option.
2018-06-15 16:34:47 -07:00