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
Andrea Luzzardi
a3950e7f65
Merge pull request #796 from jimmyxian/refresh-container
...
Add Refresh container
2015-05-21 18:30:47 -07:00
Victor Vieux
89d3c2a4cb
Merge pull request #814 from jimmyxian/fix-bool-value
...
Fix #810 bool value
2015-05-20 10:09:11 -07:00
Xian Chaobo
df50eb8c67
add unit test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 21:54:03 -04:00
Xian Chaobo
e6ce59794e
merge two image match func
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 21:39:10 -04:00
Xian Chaobo
064e91cd23
fix image match and fix docker save
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 05:21:14 -04:00
Xian Chaobo
24eb0adbb0
fix #810 bool value
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 04:01:41 -04:00
Andrea Luzzardi
dd48440d98
api: "Host Down" instead of "Pending" as a status
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00
Andrea Luzzardi
8c9449899b
api: Log requests to debug level
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00
Xian Chaobo
014947daad
refresh before closing the connection
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-18 04:52:37 -04:00
Xian Chaobo
4af3e30f64
Fix:#748 add refresh container
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-15 04:46:02 -04:00
Victor Vieux
2cb0395acf
remove images by name or ID, not always ID
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-14 15:22:06 -07:00
Victor Vieux
4da6b2b093
Merge pull request #551 from noxiouz/fix_eventsHandler
...
[eventsHandler] Use Lock/Unlock to sync a write access
2015-05-13 17:58:52 -07:00
Victor Vieux
b73f54def4
APIVersion -> ApiVersion to match docker API
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 17:12:16 -07:00
Victor Vieux
7dd0cde819
Merge pull request #766 from jimmyxian/update-readme
...
update api README.md
2015-05-12 15:46:08 -07:00
Victor Vieux
a9eb48dcf2
Merge pull request #745 from aluzzardi/swarm-id
...
Support for Swarm IDs
2015-05-12 15:12:19 -07:00
Andrea Luzzardi
bdd97c1d72
swarm id: Fix proxy for execs.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-12 14:21:09 -07:00
Xian Chaobo
a72d37be2d
update api README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-11 21:37:45 -04:00
Andrea Luzzardi
dde47ee650
swarm IDs: Convert Swarm ID to Container ID in API Proxy.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
b6a7c3d7f5
swarm ID: Remove backward compatibility.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
5c801d2c6a
swarm id: Handle compatibility.
...
Containers created with Swarm<0.3.0 or directly on the host without
going through Swarm don't have a Swarm ID. We are going to fake it by
using the Container ID.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
9e2863ec71
api: getImages: changed error message
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:44:15 -07:00
Andrea Luzzardi
7403991cac
API: Simplify getImages.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:44:15 -07:00
Xian Chaobo
42af0fadd7
fix var name and integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-11 16:44:15 -07:00
Xian Chaobo
3962f6ffdf
add-support-images-save
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-11 16:44:15 -07:00
Andrea Luzzardi
0bd4b1faca
Merge pull request #732 from vieux/fix_name_unique
...
fix name checks in create and rename
2015-05-07 16:24:16 -07:00
Victor Vieux
a74d00d1c5
fix name checks
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-07 15:50:34 -07:00
Andrea Luzzardi
5ee115fcd5
container: Use state strings from dockerclient instead of embedding
...
them.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-07 15:42:26 -07:00
Andrea Luzzardi
c69f0db71f
docker ps: Support for filters and improve state management.
...
- `docker ps` now fully supports `--filter` flags
- Generate `Status` in `docker ps` dynamically. "Up X seconds" is now
real-time.
- Misc cleanup.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 23:38:32 -07:00
Victor Vieux
cf0098ae40
Merge pull request #691 from aluzzardi/container-config
...
Embed ContainerConfig into Container
2015-05-05 23:51:18 -07:00
Xian Chaobo
28043dfd7d
check status code in exec
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-05 04:45:29 -04:00
Xian Chaobo
f802da02d7
bug fix return when not found image
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-04 04:48:44 -04:00
Andrea Luzzardi
cd3a0f03fc
container config builder: Make all modifications on a copy, never alter original.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 18:06:26 -07:00
Victor Vieux
f53b5df834
store constaints and affinities in labels
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-30 14:33:21 -07:00
Victor Vieux
6eceffacf9
use cluster.ContainerConfig
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-30 11:44:25 -07:00
Victor Vieux
e5f4243dad
support pulling private images from docker pull
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-28 11:17:44 -07:00
Andrea Luzzardi
24396d8509
Merge pull request #669 from jimmyxian/improve-rename
...
improve rename
2015-04-27 12:39:48 -07:00
Xian Chaobo
3d2537eb84
move check into cluster and rename func
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-27 08:20:55 -04:00
Xian Chaobo
b47e002e6c
improve rename and update dockerclient
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-24 21:09:26 -04:00
Andrea Luzzardi
d6011b4bc6
Merge pull request #609 from jimmyxian/add-support-imageload
...
Add support "docker load" api
2015-04-24 17:21:11 -07:00
Xian Chaobo
33eedfa1d9
update api README.md and using tab instead of whitespace
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-20 03:02:50 -04:00
Xian Chaobo
5c068de28c
add force-refresh when commit/tag/pull
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-20 02:45:06 -04:00
Xian Chaobo
f200e9a954
rebase and update test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 21:50:46 -04:00
Xian Chaobo
6ad2a7847c
stream load and output nothing if load successfully
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 21:50:46 -04:00
Xian Chaobo
34e0c78d1d
gofmt check
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 21:50:46 -04:00
Xian Chaobo
ccc32635d5
Add support Load Image
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 21:50:46 -04:00
Victor Vieux
05b01c7b43
forcerefresh after build and add test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-04-16 12:22:09 -07:00
Victor Vieux
d74e872952
add build
...
improve random selection
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-16 12:19:09 -07:00
Victor Vieux
8506acbed2
fix proxyRandom even without container
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-16 12:17:38 -07:00
Andrea Luzzardi
88801da7f4
API: Move the httpError helper into helpers.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 18:02:15 -07:00
Andrea Luzzardi
885d116759
API: Move the context from the handlers into the router.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 18:02:15 -07:00
Andrea Luzzardi
4bf8eaff7c
API: Move the router into its own file.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 17:59:32 -07:00
Andrea Luzzardi
cd832f572e
Rename api.go to handlers.go.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 17:59:32 -07:00
Andrea Luzzardi
c1a6d14792
API: Move routes outside of createRouter.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 17:59:32 -07:00
Andrea Luzzardi
442217d6dc
Cleanup events handler.
...
- Renamed Events() to RegisterEventHandler() in Engine.
- Added RegisterEventHandler() to the Cluster interface.
- Removed EventHandler requirement from swarm's Cluster constructor.
- Make API's events handler private.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 15:59:55 -07:00
Andrea Luzzardi
f5979b2fed
golint: eventsHandler -> EventsHandler.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 14:21:05 -07:00
Xian Chaobo
6306fe3b64
Update README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-09 10:44:28 +08:00
Victor Vieux
d1c41e0d43
fix node field in docker inspect
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-08 14:09:57 -07:00
Andrea Luzzardi
530d5670a4
Merge pull request #574 from vieux/node_engine
...
Transform `node interface` to `engine struct`
2015-04-07 14:11:58 -07:00
Alexandre Beslic
8590a1c69a
Merge pull request #586 from jimmyxian/attach-ws
...
Implement docker attach-ws api
2015-04-07 13:48:14 -07:00
Xian Chaobo
71cbef03dc
update README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-08 03:50:23 +08:00
Xian Chaobo
18f1095e7e
implement attach-ws api
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-08 03:48:58 +08:00
Victor Vieux
0c1782c7c0
fix proxyRandom and cleanup node -> engine
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-06 13:38:10 -07:00
Victor Vieux
1297a4cef2
transform node interface to engine struct
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-06 13:19:37 -07:00
Anton Tiurin
78f21a8e88
[eventsHandler] Use Lock/Unlock to sync a write access
...
Delete keys from internal maps in a lazy way.
The heavy Lock is acquired only when we have errors.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
2015-04-02 06:31:53 +03:00
Alexandre Beslic
98f2e2a908
Merge pull request #547 from jimmyxian/master
...
'docker tag/push' api implementation
2015-04-01 14:22:42 -07:00
Xian Chaobo
1a607fd8fa
update README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-01 18:19:47 +08:00
Xian Chaobo
33933b1922
tag/push api implementation
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-01 18:17:47 +08:00
Victor Vieux
e1e7259b8a
Merge pull request #538 from jimmyxian/master
...
Implement 'docker commit' api
2015-03-31 13:40:24 -07:00
Xian Chaobo
fe054ba57c
gofmt check and update readme
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-03-31 23:06:00 +08:00
Peggy Li
6103a94350
Improve godocs for exported values in api pkg
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-30 21:32:08 -07:00
jimmyxian
f0b19154f0
Implement 'docker commit' api
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-03-31 12:13:26 +08:00
Victor Vieux
b655cbb7c5
Merge pull request #514 from technolo-g/Issue_499_Automate_golint_pr
...
Issue #500 Run golint on codebase
2015-03-30 12:14:15 -07:00
jimmyxian
412027c212
fix 404 error
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-03-30 20:52:19 +08:00
jimmyxian
e5b594d018
fix swarm api readme
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-03-30 20:37:23 +08:00
Matt Bajor
d87c48ae4e
Fix lint violations
...
This changeset fixes all lint violations that show up with a
min_confidence of 1
- Issue #500 : Run golint on codebase
Signed-off-by: Matt Bajor <matt@notevenremotelydorky.com>
2015-03-27 21:17:44 -06:00
Victor Vieux
e6b3b04150
do not leak dockerclient
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-03-18 13:48:09 -07:00
Victor Vieux
af05bfd0ba
fix test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
Victor Vieux
bc17fbd6f7
better error
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
Victor Vieux
c969fcdae6
use dockerclient
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
Victor Vieux
b4a88ad622
Add match in images.go
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
Victor Vieux
649b6cf577
add docker rmi
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
Victor Vieux
328b9ae13b
add support for docker ps -l / -n
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-10 01:04:27 +00:00