Commit Graph

8 Commits

Author SHA1 Message Date
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
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
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
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
Mary Anthony 7858d301ff Updating for Hugo work
Updating title and other things
Removing old mkdocs file
Updating with the new sed scripts
Moving from index.md swarm-overview.md
Updating with the correct image

Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-14 16:07:37 -07:00
Alex Chan 917653254c Small spelling and capitalisation fixes
Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
2015-05-27 15:22:36 +01:00
Mary Anthony 8719caa890 Reconfigure for documentation tooling
Signed-off-by: Mary Anthony <mary@docker.com>

Removing token per Victor

Signed-off-by: Mary Anthony <mary@docker.com>

Adding in PR comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-22 10:43:36 -07:00