centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 00:08:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,542 Commits 54 Branches 28 Tags
bb0acf7660f45238bbfd77777fe1fa0b6bb0c2a2
Commit Graph

106 Commits

Author SHA1 Message Date
Victor Vieux
bb0acf7660 Merge pull request #1568 from abronan/doc_docker_daemon_background 
docs: add note for the case of the daemon being started through ssh
 2016-02-01 09:09:40 -08:00
moxiegirl
833471b74c Merge pull request #1505 from ahaurw01/docs-what-if-hosted-discovery-down 
Add a note to install-w-machine with pointers if hosted discovery is down
 2016-01-30 18:10:37 -08:00
Aaron Haurwitz
460c4ce9a7 Fix the format of bold note. 
Signed-off-by: Aaron Haurwitz <aaron.haurwitz@gmail.com>
 2016-01-30 10:20:20 -05:00
Alexandre Beslic
e85868c70c docs: add note for the case of the daemon being started through ssh 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2016-01-29 11:28:43 -08:00
Mary Anthony
c2ecf7f9f3 Adding new navigation 
Moving API to top level
Fixing broken links to api

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-24 09:02:53 -08:00
Sebastiaan van Stijn
cdc2cc3d84 Remove link to experimental "rescheduling" 
It's in experimental, so should not be linked
from in the online documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-01-13 09:27:34 -08:00
Victor Vieux
fc1e7bbca2 use docker/docker/pkg/discovery 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-12 00:38:06 -08:00
Victor Vieux
74dfe8b0f6 move doc to experimental/ 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-11 18:16:31 -08:00
Victor Vieux
78008f4d4a add doc 
fix tests and keep swarm id
remove duplicate on node reconnect
explicit failure

Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-11 15:59:44 -08:00
Tomasz Kopczynski
3d9d6dab3a docs: typo in scheduler/strategy.md 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
 2016-01-11 23:23:11 +01:00
Emilien Kenler
5efac03bad docs: Typo in scheduler/filter.md 
Signed-off-by: Emilien Kenler <ekenler@wizcorp.jp>
 2016-01-08 11:50:35 +09:00
Alexandre Beslic
40f26856a5 Merge pull request #1410 from dongluochen/joinSpike 
Add a random delay to avoid synchronized registration at swarm join. Simple fix for #1353
 2016-01-04 12:28:17 -08:00
Dong Chen
065551eaaa Update documents on resource occupation. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-16 12:02:05 -08:00
Dong Chen
13c2b60ca8 Update documentation for swarm join --delay option. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-14 17:21:15 -08:00
Alexandre Beslic
c8dd8d8b66 carry #1409, improve networking docs, remove duplicate link in discovery.md 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-14 13:35:59 -08:00
Phil Whelan
e895136580 typos 
Signed-off-by: Phil Whelan <phil123@gmail.com>
 2015-12-14 11:43:33 -08:00
Sebastiaan van Stijn
94c0593c0b Merge pull request #1537 from moxiegirl/fix-1483 
Chaning User guide to overview close #1483
 2015-12-14 20:30:26 +01:00
Victor Vieux
bbbcd0e510 Merge pull request #1384 from dhiltgen/token_auth 
Add token pass-thru for Authconfig
 2015-12-14 11:22:10 -08:00
Mary Anthony
f1fb2722a1 Chaning User guide to overview close #1483 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-12-12 21:22:17 -08:00
Daniel Hiltgen
dde577d154 Add token pass-thru for Authconfig 
This augments the CreateContainer call to detect the AuthConfig header
and use any supplied auth for pull operations.  This will allow pulling
of protected image on to specific node during the create operation.

CLI usage example using username/password:

    # Calculate the header
    REPO_USER=yourusername
    read -s PASSWORD
    HEADER=$(echo "{\"username\":\"${REPO_USER}\",\"password\":\"${PASSWORD}\"}"|base64 -w 0 )
    unset PASSWORD
    echo HEADER=$HEADER

    # Then add the following to your ~/.docker/config.json
    "HttpHeaders": {
        "X-Registry-Auth": "<HEADER string from above>"
    }

    # Now run a private image against swarm:
    docker run --rm -it yourprivateimage:latest

CLI usage example using registry tokens: (Required engine 1.10 with new auth token support)

    REPO=yourrepo/yourimage
    REPO_USER=yourusername
    read -s PASSWORD
    AUTH_URL=https://auth.docker.io/token
    TOKEN=$(curl -s -u "${REPO_USER}:${PASSWORD}" "${AUTH_URL}?scope=repository:${REPO}:pull&service=registry.docker.io" |
        jq -r ".token")
    HEADER=$(echo "{\"registrytoken\":\"${TOKEN}\"}"|base64 -w 0 )
    echo HEADER=$HEADER

    # Update the docker config as above, but the token will expire quickly...

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
 2015-12-11 18:36:55 -08:00
Alexandre Beslic
fa19c3fd55 add docs for distributed K/V discovery with secured TLS communication 
Signed-off-by: Alexandre Beslic <abronan@docker.com>

Closes #1510 and carries
Adding abronan's commentary
Tweak recommend

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-12-09 12:08:46 -08:00
Alexandre Beslic
0b0e328b7b Merge pull request #1472 from abronan/improve_docs_duplicate_engine_ids 
Add clarification on install for VM cloning and Engine ID duplication issue
 2015-12-06 21:39:37 -08:00
Alexandre Beslic
75a3ac2c7f add clarification on install for VM cloning and Engine ID duplication problem 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-06 21:27:37 -08:00
ahaurw01
bd6ad72c29 Add a note to install-w-machine with pointers if hosted discovery is down 
Signed-off-by: Aaron Haurwitz <aaron.haurwitz@gmail.com>
 2015-12-06 10:34:20 -05:00
Alexandre Beslic
3048dc996d Merge pull request #1497 from vieux/emphasis_token_not_prod 
emphasize the hosted discovery service is not meant for production
 2015-12-06 01:16:22 -08:00
Alexandre Beslic
501b9609dd fix typos and add note in discovery README for token usage scenarios 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-06 01:04:30 -08:00
Victor Vieux
765431f70f emphasize the hosted discovery service is not meant for production 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-12-04 15:22:30 -08:00
Sven Dowideit
925ac57d6c Small fixes found by linkchecker 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-12-03 21:38:37 +10:00
Daniel Nephin
f432b63fe3 Updates to swarm filters documentation 
Support reloading of docs.

Adjust the titles in docs/scheduler.filter to be more descriptive.

Also moves the meta sections about constraints out from the container affinity section.

Add a note about stopped containers being used by filters to the docs.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-12-01 17:49:25 -08:00
sandric
f7e02d64ae Update networking.md 
Fix typos

Signed-off-by: sandric <kyrychenkoanton@gmail.com>
 2015-11-28 07:48:29 +02:00
Sven Dowideit
b0705e56ee Use FROM docs/base:latest again 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-26 12:56:23 +10:00
Alexandre Beslic
1b2afce425 Merge pull request #1016 from dreilly1982/clarifyports 
Clairify port usage in multi-manager-setup.md
 2015-11-23 17:08:11 -08:00
Victor Costan
94d84a618c Document filter usage in image building. 
Signed-off-by: Victor Costan <costan@gmail.com>
 2015-11-23 13:36:05 -05:00
Alexandre Beslic
3cc7a426e3 Merge pull request #1376 from bfirsh/fix-typo-in-docs 
Fix first sentence in docs
 2015-11-23 09:55:43 -08:00
Felix Abecassis
0b171c699a Fix typo in discovery documentation 
Signed-off-by: Felix Abecassis <felix.abecassis@gmail.com>
 2015-11-18 16:49:45 -08:00
Julien Vey
bb661212f9 Fix typo in networking documentation 
"use may use" => "you may use"
add missing s

Signed-off-by: Julien Vey <vey.julien@gmail.com>
 2015-11-18 17:57:47 +01:00
auzias
95c95812a6 Typos correction 
Signed-off-by: auzias <github@auzias.net>
 2015-11-05 08:41:45 +01:00
Ben Firshman
76f35282cb Fix first sentence in docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-11-03 13:43:03 -08:00
Sven Dowideit
c1902e1222 Fix some non-relative links 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-10-22 17:22:25 +10:00
Victor Vieux
5d43f2edd3 Merge pull request #1249 from vieux/remove_beta 
remove BETA from docs
 2015-10-14 15:37:54 -07:00
Victor Vieux
49dc6498c1 Merge pull request #1285 from moxiegirl/retooling-hugo-15 
Updating with new tooling that supports GitHub source Markdown
 2015-10-13 12:55:53 -07:00
Alexandre Beslic
1e30ce215f Merge pull request #1262 from vieux/libnetwork 
add 'docker network' support
 2015-10-13 11:09:27 -07:00
Mary Anthony
f1a64ea23a Updating with new tooling that supports GitHub source Markdown 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-13 04:18:50 -07:00
Morgan Bauer
e4edd0bb88 docs additions 
- add the unix socket, the default of the docker client
 - partially resolves #804

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-10-12 16:15:40 -07:00
Victor Vieux
ca9a234f03 add some docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-09 00:26:51 -07:00
Victor Costan
aaf52189dc Document CpuShares special handling in Swarm 
The difference is currently only documented in the issue below.
https://github.com/docker/swarm/issues/475

The diff in the PR below highlights the special handling of CpuShares.
https://github.com/docker/swarm/pull/904/files

Signed-off-by: Victor Costan <costan@gmail.com>
 2015-10-08 19:05:06 -04:00
Victor Vieux
6f17105ee5 remove BETA from docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-30 13:58:44 -07:00
Mary Anthony
593838f73b Carries and fixes #1216 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-09-16 10:01:21 -07:00
Victor Vieux
c3d890a727 Merge pull request #1178 from MHBauer/hosted-network-connectivity 
Add reliance on external internet connectivity
 2015-09-01 16:45:23 -07:00
Morgan Bauer
f6caa46c98 Add reliance on external internet connectivity 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-09-01 15:00:30 -07:00