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

315 Commits

Author SHA1 Message Date
Dong Chen
d045bd44e0 Skip redundant endpoints in "network inspect" 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-22 10:19:22 -07:00
Nishant Totla
1e821e48ed Plumbing context through all calls to engine-api client 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-03-18 14:55:05 -07:00
Dongluo Chen
85f6d57f21 Merge pull request #1972 from vieux/pass-host-config 
HostConfig for /start endpoint
 2016-03-16 17:19:29 -07:00
Dongluo Chen
e0b5e6f5fa Merge pull request #1933 from allencloud/compatile-api-response-status-code 
fix two swarm apis' response status code
 2016-03-15 13:36:44 -07:00
Victor Vieux
b05dee4d6e HostConfig for /start endpoint 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-03-14 19:23:57 -07:00
Sun Hongliang
51a63c13c8 fix three swarm api response status code 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-14 00:39:34 +08:00
Xian Chaobo
e7065eabf7 add support ps node filter 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2016-03-11 10:31:33 +08:00
Nishant Totla
6af37c4888 Updating info function to use engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-03-09 13:58:50 -08:00
Nishant Totla
453304c795 Updating version function to use engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-03-07 17:46:24 -08:00
Sun Hongliang
c34a45023f fix typos in a test file and a function annotation 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-05 00:39:15 +08:00
Sun Hongliang
a718e90662 Add method HEAD in options response headers 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-02-26 11:02:18 +08:00
allencloud
c39194cc4c Fixes #1868 
1.Fixes cors bug
2.Add cors test

Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-02-25 10:35:57 +08:00
Dong Chen
e51566d255 Remove closeIdleConnections function. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-02-19 14:45:15 -08:00
Dong Chen
69535f167a Do not recycle connections. Let net/http handles connections. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-02-18 18:02:10 -08:00
Victor Vieux
c42142e408 Revert "Passing HostConfig for /start endpoint" 
This reverts commit 6ff0d29c9d.

Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-17 15:46:37 -08:00
Nishant Totla
6ff0d29c9d Passing HostConfig for /start endpoint 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-02-17 11:06:51 -08:00
Victor Vieux
64b9c50b69 use same HTTP client as dockerengine 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-11 15:03:38 -08:00
Victor Vieux
9a43172135 add Server Version to docker info 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-09 22:39:53 -08:00
Sebastiaan van Stijn
aa474f59b5 Fix broken links in README 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-02-05 02:07:07 +01:00
Victor Vieux
cbfdb37fde Merge pull request #1744 from nishanttotla/UpdateAPIVersion 
Bump API version
 2016-02-02 19:01:26 -08:00
Nishant Totla
a67d3ef125 Bump API version 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-02-02 18:40:03 -08:00
Victor Vieux
5347098def support disconnect -f and use random engine 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-02 16:47:45 -08:00
Victor Vieux
24fe2c04e5 support docker network ls --filter type=XXX 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-02 15:57:53 -08:00
Victor Vieux
336a4ff9ae Merge pull request #1721 from nishanttotla/1625-RemoveInfoBackspaces 
Removing backspaces in /info output for new API version
 2016-02-01 09:30:51 -08:00
Alexandre Beslic
d9c677f50b Merge pull request #1697 from jimenez/double_start 
Fix double start with Mesos
 2016-02-01 09:08:20 -08:00
Nishant Totla
3d7678389f Removing backspaces in /info output for new API version 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-01-31 23:54:33 -08:00
Isabel Jimenez
c809e6a643 Fix double start 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2016-01-31 19:08:48 -05:00
Victor Vieux
aa028f4d09 Host Down containers in ps requires -a 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-28 11:28:19 -08:00
Nishant Totla
4467298b62 Extracting apiversion from HTTP request 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-01-28 11:14:56 -08:00
Victor Vieux
f3a1027bbe update docker info 
add test

Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-27 01:07:52 -08:00
Victor Vieux
cc4eea83da Merge pull request #1669 from dongluochen/dockerUpdateCmd 
Support 'docker update' command
 2016-01-22 17:43:41 -08:00
Dong Chen
f42f5fa3d4 Support 'docker update' command. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-01-22 17:10:22 -08:00
Victor Vieux
13d2212a3a rename 2 handlers 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-16 20:29:59 -08:00
Victor Vieux
1225eddc79 allow engine/name support in volumes 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-16 17:40:53 -08:00
Victor Vieux
04fb48d27a support 1.10 events 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-15 19:35:04 -08:00
Victor Vieux
6dcb170808 add buildtime, kernelversion and experimental to API version 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-12 02:55:53 -08:00
Victor Vieux
31ad0e047f update godeps 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-12 00:38:09 -08:00
Mary Anthony
1bfdf55a52 Updating READMEs 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-12 00:34:57 -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
Victor Vieux
cc7acf92e7 fix status code when container found on unhealthy node 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-01-04 17:24:10 -08:00
Victor Vieux
be0fce961f update code 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-22 00:20:04 -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
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
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
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
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
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
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