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
Victor Vieux
4748bb14dd
add trace
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-07 21:59:03 -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
Brian Goff
c57c8a329e
Ensure CloseWrite is called for hijacked TLS conns
...
Golang's `*tls.Conn` does not support `CloseWrite`, this means that
connections using TLS will not be able to properly close on hijacked
connections.
This copies Go's tls.Dial and instead returns an internal
`tlsClientConn` type that does store the raw net.Conn and implements
`CloseWrite`.
Implementation is mostly copied from
`github.com/docker/docker/api/client/hijack.go`
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-12-03 22:48:28 -05:00
Xian Chaobo
63498b1a80
set MemorySwappiness default value
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-12-04 09:25:32 +08:00
Andrea Luzzardi
f1155ca431
Enable profiling over HTTP in debug mode
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-12-03 03:01:05 -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
Dong Chen
59a1f2427b
Close tcp connection when client stops '/events' request.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-11-24 16:18:18 -08:00
Alexandre Beslic
62c5d4b47a
Merge pull request #1392 from MHBauer/issue1367
...
add newline to event json to match docker
2015-11-23 09:54:00 -08:00
Xian Chaobo
d64a7a5f95
Merge pull request #1414 from vieux/event_delete
...
fix event deletion under lock
2015-11-19 08:43:28 +08:00
Morgan Bauer
99846a0b85
add newline to event json to match docker
...
- docker server has a newline separating individual json entries
- create const string for format
- resolves #1367
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-11-15 14:14:02 -08:00
Victor Vieux
9ff2197596
fix event deletion under lock
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-11-14 19:35:15 +01: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
Chanwit Kaewkasi
894d1abd63
Merge pull request #1308 from pdevine/errorstrs
...
Add error messages when pulling/loading images
2015-10-17 07:42:39 +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
Brian Goff
d7cb8baf09
Fix issue where conn is stuck waiting for stdin
...
This was hard to repro, but found out it seems to only happen with TLS
connections.
When `docker run -i` was set, the client gets stuck waiting for sdin on
exit, and requires hitting return twice.
This fix ensures that:
1. When stdin is done, wait for stdout always
2. When stdout is done, close the stream and wait for stdin to finish
On 2, stdin copy should return immediately now since the out stream is closed.
Note that we probably don't actually even need to wait here.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-16 15:16:25 -04:00
Victor Vieux
587d535188
add support docker connect / disconnect
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
Victor Vieux
e5eeec580c
use overlay as default in swarm
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
Victor Vieux
78ecf8497c
Add network rm
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
Victor Vieux
b007cae8b2
Add docker network create
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Victor Vieux
8559fb0fc6
remove cluster.Network(IDOrName)
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Victor Vieux
12c2d46dd5
prepend engine name on network name
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-08 22:35:07 -07:00
Victor Vieux
e634df03a7
add 'docker network ls' support
...
add 'docker network inspect' suport
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Alexandre Beslic
5f807caef1
Merge pull request #1252 from vieux/fix_detach_exec
...
fix exec -d
2015-10-08 18:32:07 -07:00
Daniel Nephin
8abf7d32e9
Support filtering images by labels
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 15:45:52 -04:00
Victor Vieux
26785556fa
fix exec -d
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-01 07:29:38 -07:00
Alexandre Beslic
a792519978
Merge pull request #1208 from vieux/volume_create_delete
...
docker volume create & docker volume delete
2015-09-23 10:45:44 -07:00
Xian Chaobo
063f5dbab4
Merge pull request #1204 from MHBauer/events-until
...
implement `--until` flag for swarm api
2015-09-22 09:13:02 +08:00
Morgan Bauer
b1d3b625de
implement `--until` flag for swarm api
...
- mostly copied the idea from base docker
- refactored the locking in event handling
- integration test for until flag
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-09-18 14:20:30 -07:00
Victor Vieux
79d1ee4861
add volume create
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:23:22 -07:00
Victor Vieux
440a379860
docker volume rm
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:22:57 -07:00
Xian Chaobo
5cc6e3f30c
fix import/load return code
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-15 10:00:49 -04:00
Xian Chaobo
a10a39c462
fix pull return code
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-10 04:10:28 -04:00
Chanwit Kaewkasi
30cfdfb12d
Merge pull request #1196 from vieux/initial_volume_support
...
add support for docker volume ls & inspect
2015-09-09 09:56:39 +07:00
Victor Vieux
77c96908f0
add support for docker volume ls & inspect
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-05 07:56:22 -07:00
Chanwit Kaewkasi
45e091bca5
implement grouping list of images by Id
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-09-04 02:15:05 +07:00
Victor Vieux
d571b7e39e
Revert "prevent double starts with mesos"
...
This reverts commit 9a93dcf46b .
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-02 20:33:49 -07:00
Chanwit Kaewkasi
4cdbe875b8
Merge pull request #1155 from vieux/fix_mesos_logs
...
prevent double logs with mesos
2015-09-03 13:10:52 +07:00
Victor Vieux
42bb1f3f5b
Merge pull request #1159 from jimmyxian/fix-tag-images
...
fix tag image
2015-09-01 11:25:48 -07:00
Victor Vieux
9a93dcf46b
prevent double starts with mesos
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-31 22:52:43 -07:00
Xian Chaobo
29df83a349
fix tag image
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-31 07:17:30 -04:00
Xian Chaobo
12e956e681
add support force remove images
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-19 23:09:02 -04:00
Xian Chaobo
d4daee4f27
add support images -a
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-12 07:39:11 -04:00
Victor Vieux
31932311a1
add support for --before in ps
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-01 16:41:48 -07:00
Xian Chaobo
fdcb59b4ec
fix load api
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-05 02:44:54 -04:00
Andrea Luzzardi
3bb4373f9f
Merge pull request #1111 from vieux/no_json_manual
...
do not generate JSON by hand
2015-08-04 15:30:30 -07:00
Victor Vieux
2606db4486
Merge pull request #1085 from jimmyxian/improve-build
...
Improve build
2015-08-04 11:44:17 -07:00
Xian Chaobo
a3cf5b9e9c
improve build
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-04 02:45:06 -04:00
Victor Vieux
7ec33a81b5
do not generate JSON by hand
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-30 18:10:13 -07:00
Victor Vieux
5a217d6169
add new endpoints for docker cp
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-18 22:04:56 -07:00
Peggy Li
0572a6778c
Fix 'Scheduler' typos and update User Guide link
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-07-20 20:41:33 -07:00
Alexandre Beslic
02ba1fad43
Merge pull request #1032 from vieux/fix_match_push
...
fix image matching in push
2015-07-14 17:02:01 -07:00
Ryan Graham
9bd9fee7d6
preserve status code from POST /containers/*/exec
...
The docker remote API specifies that a 201 is returned on successful
creation of an Exec and a strict client will not accept that being
turned into a 200.
https://docs.docker.com/reference/api/docker_remote_api_v1.19/#exec-create
Resolves #1055
Signed-off-by: Ryan Graham <r.m.graham@gmail.com>
2015-07-12 15:31:59 -07:00
Victor Vieux
0268b1ce89
/info now returns SystemTime
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-06 17:56:35 -07:00
Victor Vieux
e10b4555e7
add name, http_proxy, https_proxy and no_proxy to docker info
...
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-06 15:17:48 -07:00
Victor Vieux
a54763ca55
fix image matching in push
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-06 14:57:44 -07:00
Victor Vieux
126eade4b9
remove 2 warnings in docker info
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-30 15:20:44 -07:00
Andrea Luzzardi
3ee1c37ba3
replica proxy: Improve error messages.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 13:27:35 -07:00
Andrea Luzzardi
10ba572658
API: Cleanup router/proxy.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-11 20:41:27 -07:00
Andrea Luzzardi
d63de2da48
leader election: Display replica status in docker info.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-11 18:56:02 -07:00
Victor Vieux
c1020da636
nits
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:25:51 -07:00
Victor Vieux
4f9c9f5867
use dockerclient structs
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:25:51 -07:00
Victor Vieux
2bf6c1a529
improve docker infi with 1.7
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:25:51 -07:00
Victor Vieux
fb63a90610
add images to docker info
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-02 10:53:19 -07:00
Xian Chaobo
3bd2e5b584
update README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-27 22:11:04 +08:00
Xian Chaobo
1f20358b5d
add support import
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-27 22:11:03 +08:00
Victor Vieux
0b24992d7c
Merge pull request #815 from jimmyxian/rmi_by_name
...
Fix image match
2015-05-26 10:43:59 -07:00
Andrea Luzzardi
b4efc08dfc
api: Integrate leader election.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-22 21:23:34 -07:00
Andrea Luzzardi
d8a0ba5d88
api: Remove unused test.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-22 20:08:12 -07:00