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

2701 Commits

Author SHA1 Message Date
Alexandre Beslic 8c5b47b527 Merge pull request #1558 from vieux/update_docker_godeps 
cleanup godeps
 2016-01-04 11:13:38 -08:00
Dong Chen 995866d76c Improve node management. 
1. Introduce pending state. Pending nodes need validation before moving to healthy state. Resolve issues of duplicate ID and dead node drop issues.
2. Expose error and last update time in docker info.
3. Use connect success/failure to drive state transition between healthy and unhealthy.

Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-30 13:25:43 -08:00
Alexandre Beslic 2aff182135 Merge pull request #1566 from lowstz/fix-doc-typo 
Fix leadership doc example typo
 2015-12-29 11:59:42 -08:00
Aaron Chen 5728b670ae Fix Fault Tolerance section code example without ttl 
Signed-off-by: Aaron Chen <aaron.chen@curiositychina.com>
 2015-12-30 03:08:09 +08:00
Aaron Chen 3cf44b5b24 Fix leadership doc example typo 
Signed-off-by: Aaron Chen <aaron.chen@curiositychina.com>
 2015-12-29 19:11:35 +08:00
Victor Vieux 15a91b1c73 Merge pull request #1564 from vieux/fix_stable_tests 
fix stable tests
 2015-12-22 15:21:39 -08:00
Victor Vieux a2380a6c71 update godeps 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-22 00:20:04 -08:00
Victor Vieux be0fce961f update code 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-22 00:20:04 -08:00
Victor Vieux c11d4fe82c fix stable tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-22 00:03:59 -08:00
Isabel Jimenez de0e67f571 Merge pull request #1554 from ezrasilvera/mesosFixLock 
Change the scheduler lock in Mesos cluster
 2015-12-18 10:20:29 -08:00
Alexandre Beslic 7b1fee929a Merge pull request #1555 from vieux/removes 
remove sleep from tests
 2015-12-17 17:53:12 -08:00
Dongluo Chen c60ec6fd23 Merge pull request #1520 from dongluochen/DocUpdateResource 
Update document on resource occupation.
 2015-12-17 17:22:33 -08:00
Victor Vieux d00c23094b remove sleep from tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-17 16:49:54 -08:00
Victor Vieux 53cf899e31 Merge pull request #1517 from dongluochen/EngineFastFailure 
Use failureCount as a secondary health indicator.
 2015-12-17 16:35:29 -08:00
Victor Vieux 5050e79f83 Merge pull request #1552 from abronan/fix_lock_ttl_store_failure 
Fix Consul Lock TTL with store failure
 2015-12-17 13:27:42 -08:00
Alexandre Beslic 2a9e162556 Merge pull request #1553 from fsoppelsa/readme-contributelinks 
Readme contributelinks
 2015-12-17 10:13:55 -08:00
Ezra Silvera 219f7192d6 Change the scheduler lock in Mesos cluster 
Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
 2015-12-17 18:20:57 +02:00
Fabrizio Soppelsa 2cfa251165 Add the Swarm contribute link and correct a "here" without link 
Signed-off-by: Fabrizio Soppelsa <fsoppelsa@mirantis.com>
 2015-12-17 00:01:28 -08:00
Alexandre Beslic 5e8998eb6d Fix Consul Lock TTL with store failure 
If using the Lock TTL feature with Consul, the code
path in libkv is issuing a Put in the background through
the PeriodicRenewal call. The error is then eaten up and
ignored on the candidate loop. This would lead to the
candidate and followers being stuck in their candidate
loop. Consequence would be that they would not retry to
take the lock ending in a state with no Leader.

This patch restores an explicit error check instead of
wrongfully passing on the error to the channel before
giving it back to the caller.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-16 15:46:11 -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 02553d0727 Cover connection failure error reported by dockerclient and by proxy cases. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-15 19:20:29 -08:00
Dong Chen d80a32b3df Explicitly deprecate --engine-refresh-retry. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-15 19:13:03 -08:00
Dong Chen 82d16226e6 rebase and update test case. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-15 19:13:03 -08:00
Dong Chen 9bc6c35321 Use engine connection error to fail engine fast. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-15 19:13:03 -08:00
Dong Chen ec3b00c484 Reorganize engine failure detection procedure. Change engine option 'RefreshRetry' to 'FailureRetry'. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-15 19:13:03 -08:00
Dong Chen 4d24256c19 Use failureCount as a secondary health indicator. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-15 19:13:03 -08:00
Alexandre Beslic 91f9a4e89b Merge pull request #1547 from vieux/fix_network_inspect_global 
display all the containers that are part of a global network on inspect
 2015-12-15 18:05:28 -08:00
Victor Vieux cdd42a5c6b display all the containers that are part of a global network on inspect 
update godeps

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-12-15 17:48:35 -08:00
Andrea Luzzardi 7291ec144c Merge pull request #1544 from yangdongsheng/sort 
api: Sort images by Created.
 2015-12-14 22:11:03 -08:00
Dongsheng Yang 5aecaddf72 api: Sort images by Created. 
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
 2015-12-15 13:15:00 +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
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