docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,369 Commits 17 Branches 28 Tags 824 MiB
Commit Graph

2369 Commits

Author SHA1 Message Date
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
Dong Chen 2c029f9795 Change '--joindelay' to '--delay' since it's a join option. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-14 17:00:34 -08:00
Dong Chen db5c8aba7c Add a command line option for swam join delay. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-14 17:00:34 -08:00
Dong Chen 36ca8ff63f Add a random delay to avoid synchronized registration at swarm join. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-14 17:00:34 -08:00
moxiegirl 9dc6ce8d0f Merge pull request #1474 from abronan/fix_license_grant 
Fix Swarm project License grant and scope
 2015-12-14 15:45:17 -08:00
Victor Vieux ed987b8d85 Merge pull request #1542 from jimenez/slave_to_agent 
Name changing slave to agent
 2015-12-14 13:57:31 -08:00
Sebastiaan van Stijn 2fdda583ec Merge pull request #1473 from abronan/typo_networking_doc 
Typos networking doc
 2015-12-14 22:44:44 +01: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
Isabel Jimenez 18cccc521c renaming files + change on tests 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2015-12-14 16:20:38 -05:00
Victor Vieux 81bf5bc067 Merge pull request #1538 from vitan/patch-1 
Typo
 2015-12-14 13:18:26 -08:00
Isabel Jimenez 60c15834da changing slave to agent 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2015-12-14 14:46:56 -05: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
Zhou Weitao 72db0bbc04 Typo 
Signed-off-by: Weitao Zhou <wtzhou@dataman-inc.com>
 2015-12-14 09:55: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
Daniel Hiltgen f0b785a206 Vendor bump of dockerclient 
This adds the new auth client token support.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
 2015-12-11 18:36:55 -08:00
Alexandre Beslic d3affe5904 Merge pull request #1535 from vieux/prevent_panic_no_name 
prevent panic in filters when container has no name
 2015-12-11 17:50:08 -08:00
Victor Vieux 47d63f9b72 Merge pull request #1532 from jimenez/integration_tests 
Adding integration tests for mesos
 2015-12-11 15:56:34 -08:00
Dongluo Chen 982c568991 Merge pull request #1523 from vieux/release_checklist 
add RELEASE-CHECKLIST.md
 2015-12-11 15:25:25 -08:00
Isabel Jimenez 70a2713c60 Adding integration tests for mesos 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2015-12-11 16:14:49 -05:00
Alexandre Beslic f9e4b84a19 Merge pull request #1530 from vieux/handle_engine_unhealthy_in_proxy 
return proper error for inspect and proxy on unhealthy node
 2015-12-11 11:00:43 -08:00
Victor Vieux 0116fbf3d0 Merge pull request #1531 from ch3lo/fix-typo 
fix bracket
 2015-12-11 10:37:10 -08:00
Victor Vieux 2497df0862 prevent panic in filters when container has no name 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-11 02:11:21 -08:00
Victor Vieux f25040f3ab add RELEASE-CHECKLIST.md 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-12-10 22:46:14 -08:00
Marcelo Salazar R 3e0d4f124e fix bracket 
Signed-off-by: Marcelo Salazar R <chelosalazar@gmail.com>
 2015-12-11 02:44:19 -03:00
Victor Vieux 4b33656bb4 return proper error for inspect and proxy on unhealthy node 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-12-10 20:05:17 -08:00
Victor Vieux 744e3a3925 Merge pull request #1522 from dongluochen/bump-1.0.1 
Bump version to 1.0.1
 2015-12-09 15:51:57 -08:00
Dong Chen af8cabf71d Bump version to 1.0.1 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-09 15:39:20 -08:00
Victor Vieux 94220e5f96 Merge pull request #1519 from vieux/add_dong_maintainers 
Add Dongluo to the MAINTAINERS file
 2015-12-09 14:25:09 -08:00
Victor Vieux 284a00e811 Add Dongluo to the MAINTAINERS file 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-12-09 14:07:29 -08:00
Victor Vieux 059ab13807 Merge pull request #1518 from suryagaddipati/patch-1 
Fix busted link
 2015-12-09 12:29:59 -08:00
Victor Vieux 54c97525e3 Merge pull request #1514 from moxiegirl/carry-1510 
Carry 1510
 2015-12-09 12:29:41 -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
Surya Gaddipati a8d4c4b0f4 Fix busted link 
Signed-off-by: Surya Gaddpati <surya.gaddipati@gmail.com>
 2015-12-09 11:18:15 -06:00
Xian Chaobo 5b28d35d31 Merge pull request #1515 from vieux/refresh_docker_godeps 
update docker godeps
 2015-12-09 10:15:45 +08:00
Alexandre Beslic a51ebdacb9 Merge pull request #1446 from MHBauer/gh1442 
OPTIONS response when cors is enabled
 2015-12-08 14:27:29 -08:00
Morgan Bauer 4dcf5a2c05
OPTIONS response when cors is enabled 
- pulled out router setup into separate method for testing
 - unit test without cors
 - unit test for cors + OPTIONS
 - resolves #1442

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-12-08 13:09:37 -08:00
Alexandre Beslic 31791e2241 Merge pull request #1513 from vieux/compose_1.5.2 
update compose to 1.5.2
 2015-12-08 12:43:37 -08:00
Victor Vieux 4aafe4aa7b Merge pull request #1492 from aluzzardi/profiling 
Enable profiling over HTTP in debug mode
 2015-12-08 12:43:00 -08:00
Alexandre Beslic ba976ed0b9 Merge pull request #1512 from vieux/1.5.1- 
go 1.5.1->1.5.2
 2015-12-08 12:23:10 -08:00
Victor Vieux cac42dc677 update docker godeps 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-08 03:39:27 -08:00
Victor Vieux b399d7c7ed update compose to 1.5.2 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-07 22:05:58 -08:00
Victor Vieux 0bddb0096f longer retries 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-07 22:04:14 -08:00
Victor Vieux 4748bb14dd add trace 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-07 21:59:03 -08:00
Victor Vieux 9677ddd06f 1.5.1->1.5.2 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-07 21:45:34 -08:00
Victor Vieux a4a1d3bd01 Merge pull request #1466 from abronan/fix_ci_discovery_race 
Integration: Wait for nodes to be registered and discovered before testing
 2015-12-07 21:11:20 -08:00
Victor Vieux f1b7b7be59 fix tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-07 19:57:29 -08:00
Victor Vieux 67a4d559db Merge pull request #1449 from jimenez/mesos_user_abnormal_error 
Improving error output for bad swarm mesos user
 2015-12-07 13:43:34 -08:00