Commit Graph

139 Commits

Author SHA1 Message Date
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
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
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
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 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 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
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
Alexandre Beslic 4581e65432 Merge pull request #1438 from dongluochen/networkId
Route network connect/disconnect request to the right engine.
2015-12-04 16:03:54 -08:00
Xian Chaobo 63498b1a80 set MemorySwappiness default value
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-12-04 09:25:32 +08:00
Dong Chen 10986a6038 Use ioutil.NopCloser to make copy of http.request.Body.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-02 18:46:16 -08:00
Dong Chen 22ff794c2e Route network connect/disconnect request to the right engine.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-02 18:46:16 -08:00
Shijiang Wei 3f6182c384 fix the panic when "ps -a" with dead containers
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-11-30 22:16:43 +08:00
Xian Chaobo bea12ab8ab add support do with image digest
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-11-11 12:11:08 +08:00
Xian Chaobo 5d1fd77aea fix push image
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-29 20:41:28 +08:00
Victor Vieux 86816e7d44 Merge pull request #1287 from dnephin/fix_filter_images_by_repo
Fix filter images by repo
2015-10-27 21:33:25 -07:00
Victor Vieux 479db2904f fix network inspect via name for global scope
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-27 20:40:13 -07:00
Daniel Nephin e001980b5c Add filter by image name support to /images/json
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-27 11:00:37 -04:00
Victor Costan e32b3211ae Swarm filters support in image building.
When building an image (POST /build), swarm will extract filters from
buildargs. This is similar to how container creation (POST
/containers/create) extracts filters from environment variables.

Signed-off-by: Victor Costan <costan@gmail.com>
2015-10-23 14:24:42 -04:00
Victor Vieux 95c1147b73 return 200 OK in /images/create
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-22 09:09:09 -07:00
Alexandre Beslic 975eaa9e73 Merge pull request #1320 from dnephin/support_filter_networks
Support filtering networks by id or name
2015-10-21 17:45:56 -07:00
Alexandre Beslic e5523c250a Merge pull request #1321 from vieux/update_endpoint_volume_create
rename `POST /volumes` to `POST /volumes/create`
2015-10-21 16:17:50 -07:00
Daniel Nephin cd5de97a8d Update api version to match the version that swarm supports.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-21 15:44:02 -04:00
Daniel Nephin a7550e9e70 Support filtering networks by id or name.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-21 14:23:26 -04:00
Victor Vieux 6643894063 rename `POST /volumes` to `POST /volumes/create`
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-17 23:50:50 -07:00
Victor Vieux 4e1ae773e2 improve docker network ls and rm
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-19 15:42:56 -07:00
Andrea Luzzardi 58558f5224 Fix various golint issues.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-19 13:58:21 -07:00
Patrick Devine fe73803861 Add error messages when pulling/loading images
This change adds error strings when there is an error while pulling or
loading an image.

Signed-off-by: Patrick Devine <patrick.devine@docker.com>
2015-10-16 14:58:07 -07:00