centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-01 08:48:56 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,731 Commits 54 Branches 28 Tags
8dc09aafe02cc39aecd15df1633fbc09cc102b97
Commit Graph

136 Commits

Author SHA1 Message Date
John Day
e94ca74a6a Syntax error - changed container to constraint 
Syntax Error
From:
The `<filter-type>` is either the `affinity` or the `container` keyword. It
identifies the type filter you intend to use.
To:
The `<filter-type>` is either the `affinity` or the `constraint` keyword. It
identifies the type filter you intend to use.

Signed-off-by: John Day <john@containerx.io>
 2016-03-01 04:11:29 +00:00
Mary Anthony
ec8ceae209 Fixing problems with the instructions 
Updating the application after test
Removing the sudo as it caused issues
Adding new screen shots
Breaking into several files/sections
Adding in the alias from the old single page version
Moving to old path to avoid an alias
Adding in Dong's comments
Updating with latest fixes
Fixing nits and more

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-27 09:04:49 -08:00
wenchma
482830b296 Reformat to make it look more graceful 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>

Fixing formatting carry and close #1886

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-27 08:28:52 -08:00
moxiegirl
9617bdb860 Merge pull request #1875 from moxiegirl/carry-close-1852 
Fixed typos and formatting issues.
 2016-02-24 09:28:03 -08:00
Rolfe Dlugy-Hegwer
b9f7b8a91a Fixed typos and formatting issues. 
Signed-off-by: Rolfe Dlugy-Hegwer <rollfedh-contractor@docker.com>
Adding in comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-24 09:17:06 -08:00
Rolfe Dlugy-Hegwer
e8fad3d657 command reference and docker file 22:05 
fix bad links

Signed-off-by: Rolfe Dlugy-Hegwer <rollfedh-contractor@docker.com>
 2016-02-24 08:44:58 -08:00
skohar
744a811206 Remove redundant spaces 
Signed-off-by: skohar <skohar@users.noreply.github.com>
 2016-02-23 11:40:27 +09:00
Sebastiaan van Stijn
0adeae325e Remove tutorials from Dockerfile 
The "docker/tutorials" repository is now
private, causing building the docs to fail.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-02-19 13:02:06 +01:00
moxiegirl
1fab0aed5a Merge pull request #1797 from nishanttotla/improve-swarm-machine 
Removing hard-coded ips from swarm w/ machine doc
 2016-02-12 13:23:56 -08:00
skohar
eb725973a2 Fix typo 
Signed-off-by: skohar <skohar@users.noreply.github.com>
 2016-02-12 09:21:34 +09:00
Nishant Totla
ee39394741 Removing hard-coded ip from swarm w/ machine doc 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-02-11 14:27:09 -08:00
Arthur Barr
a08742eb72 Fix typo 
Signed-off-by: Arthur Barr <arthur.barr@uk.ibm.com>
 2016-02-10 12:01:45 +00:00
Nishant Totla
95e97d6151 Fixing typo in install w machine doc 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-02-09 08:54:49 -08:00
moxiegirl
c31ce7475d Merge pull request #1764 from dongluochen/tlsDoc 
Update configure-tls.md
 2016-02-08 18:19:03 -08:00
Nishant Totla
27d9fde0af Fixing Swarm Install with Machine doc 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-02-08 18:08:02 -08:00
Mary Anthony
c48aa79979 Fixing links after move of repo 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-07 19:52:22 -08:00
Victor Vieux
c7eb7ee52f remove build step 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-06 10:59:17 -08:00
Dong Chen
e96c222722 Update configure-tls.md. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-02-05 14:18:36 -08:00
Victor Vieux
573dd33995 Merge pull request #1757 from moxiegirl/fix-format 
Fix format for command
 2016-02-04 10:50:56 -08:00
runseb
e121dd0986 Update networking.md 
Small typo in bridge driver when creating bridge network.

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2016-02-04 14:46:43 +01:00
Mary Anthony
a1e183c4bd Fix format for command 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-04 05:13:19 -08:00
Rolfe Dlugy-Hegwer
b88cb64358 new content for install-on-aws and images for other topics 
Issues #1606 #1605

Signed-off-by: Rolfe Dlugy-Hegwer <rollfedh-contractor@docker.com>
 2016-02-03 17:13:56 -08:00
Sven Dowideit
be31e00c09 Move the get-swarm doc into the new DockerSwarm menu 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-02-03 16:14:44 -08:00
Victor Vieux
658280c5d7 Merge pull request #1694 from moxiegirl/securing-swarm 
High-level docs for Swarm
 2016-02-03 13:13:19 -08:00
Mary Anthony
2dd1f47c5b Updating with Dong's fine 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-03 12:45:25 -08:00
Mary Anthony
f93d787e3b WIP: TLS Docs for Swarm 
Struct edit pass thru conceptual material
Updating with comments from Mike
Tweaking menu layout
Updating for Nigel
Updating with local images, formatting fixes
Updating with the comments from review

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-03 10:37:54 -08:00
Mary Anthony
c1b5c9c49c Adding get-swarm and fix for #1580 
Fixing duplicate PR
Updating get-swarm
Removing the fix for fix for #1580
Update with MB comments
Fixing note

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-03 06:01:01 -08:00
Clément Aigreault
3ece47ff91 Fix three typo in docs/scheduler/filter.md 
dafult -> default
by by -> by
want run -> want to run

Signed-off-by: Clément Aigreault <aigreaultc@gmail.com>
Signed-off-by: Uhsac <aigreaultc@gmail.com>
 2016-02-02 22:09:55 +01:00
moxiegirl
e9cd4ff2a6 Merge pull request #1382 from xcl3721/patch-2 
make the command clearly
 2016-02-01 11:51:10 -08:00
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
Chang Long Xu
b0653fa473 recommit 
Signed-off-by: Chang Long Xu <xcl_rockman@qq.com>
 2015-12-10 09:16:12 +08:00