centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 06:18:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
52,284 Commits 55 Branches 28 Tags
a8e4da7b4da95fb50753b017c77523794e024140
Commit Graph

61 Commits

Author SHA1 Message Date
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
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
Srinivas Reddy Thatiparthy
05b87ee0ff Add note about host networking in linux 2018-06-06 11:43:35 -07:00
Jonathan Lee
73680bc5c4 Fixing typo in Publish ports table. (#6808) 2018-06-03 20:31:39 -07:00
Vimal Raghubir
7b6e7dc31e Fixed broken Link for Docker Reference Architecture 2018-05-22 10:56:55 -07:00
pallxk
35cd70f4f1 Fix typo in proxy.md 2018-05-16 15:48:29 -07:00
victor23d
8e19bf18de Update network-tutorial-standalone.md 2018-05-15 16:32:35 -07:00
Mike Damm
c0827dd305 Properly escape angle brackets (#6539) 2018-04-25 10:08:55 -07:00
John Hu
b04466a40e Typo (#6463) 2018-04-18 16:03:42 -07:00
Samuel Coronado
ea0b363e94 fixing typo + clarifying verbiage (#6445) 2018-04-13 09:57:43 -07:00
Akihiro Suda
88eedbf8b2 add sctp docs (#6078) 2018-04-11 14:03:50 -07:00
Gwendolynne Barr
ebf3cef80c Attach container (#6425) 2018-04-10 15:10:02 -07:00
Ambes Stephen
495e7204dd Update network-tutorial-host.md 
The docker run argument order is -dit in most part, bu i found a different order -idt here.I believe it is  better to have inconsistent order in the entire documentation. It can be confusing for new-bees if they see these parameters are ordered inconsistently across documentation flow.
 2018-04-10 11:00:48 -07:00
Julien Maitrehenry
72f9b29cde Add a note on service discovery on swarm 2018-04-10 10:59:48 -07:00
Gwendolynne Barr
599e1f027a Repair overlay standalone tutorial (#6398) 2018-04-10 08:15:59 -07:00
Gwendolynne Barr
12d9222b7b Repair 404 (#6353) 2018-03-30 12:42:24 -07:00
Deshi Xiao
7f4313978d correct example for --aux-address parameter 2018-03-27 09:56:18 -07:00
sabkent
efd97e5562 Update network-tutorial-overlay.md (#6157) 2018-03-06 06:59:16 -08:00
Chris Helming
81619c2168 Update bridge.md (#6144) 2018-03-05 07:07:57 -08:00
Christian Salway
31bb573f72 Spelling error 
two two = to two
 2018-03-02 10:53:59 -08:00
gonzalovera
5313817cff Update network-tutorial-overlay.md (#6114) 
Just a typo. Missing u.
 2018-02-28 10:42:52 -08:00
LydellManganti
f3420e8c88 Update network-tutorial-standalone.md (#6056) 
Fix typo on Step 7 Detach should be from alpine1 instead of alpine2.
 2018-02-23 15:26:11 -08:00
gore28akshay
9adcf16145 Update bridge.md 
Spelling mistake.
 2018-02-15 11:52:18 -08:00