31d0f31ae9
change Memory type to int64 in ContainerNode
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-07 11:48:08 +08:00
9245c24707
Merge pull request #238 from vdemeester/update-errors
...
Make NotFound Errors exportable
2016-06-06 18:18:15 -07:00
8f30a1c59b
Merge pull request #259 from joe2far/patch-1
...
Fixed typo in README
2016-06-05 19:12:17 +02:00
278b40576e
Fixed typo in README
...
Signed-off-by: joe2far <joe2farrell@gmail.com>
2016-06-03 17:44:19 +01:00
5156f5c311
Updates NotFound Errors to implement an interface
...
This makes it easier to mock then in unit-tests that use engine-api and
needs for some cases, generate a NotFound error.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-03 18:30:38 +02:00
772250a752
Merge pull request #257 from runcom/fix-for-go1.7
...
client: request: check only 'bad certificate'
2016-06-03 15:43:53 +02:00
3c95290e37
client: request: check only 'bad certificate'
...
This is because go1.7+ now prints 'tls: ' before
eede112492
2016-06-03 15:36:53 +02:00
5d87393723
Merge pull request #256 from yongtang/22471-daemon-shutdown-timeout
...
Add config parameter to change per-container stop timeout during daemon shutdown
2016-06-03 14:29:30 +08:00
e0022a2a04
Add config parameter to change per-container stop timeout during daemon shutdown
...
This fix tries to add a `StopTimeout` in container's Config so that a per-container
stop timeout could be specified during daemon shutdown.
The `StopTimeout` is defined as `*int` so that unspecified value could be
correctly identified as using the default value (10s).
Note: Both `0` and `-1` could not be used as the default value because
`0` means stop immediately and `-1` means wait forever.
This fix is related to docker:
https://github.com/docker/docker/pull/22566
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-02 19:36:40 -07:00
78e70eee96
Merge pull request #254 from jhowardmsft/shell
...
Add shell to support SHELL in dockerfile
2016-06-03 02:05:15 +02:00
73cef48eb7
Remove /json from API URLs
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-06-02 16:33:07 -07:00
1837c8a53c
Add shell to support SHELL in dockerfile
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-06-02 16:21:50 -07:00
fa04f66c78
Merge pull request #236 from talex5/healthcheck
...
Update types to support HEALTHCHECK feature
2016-06-02 23:38:33 +02:00
1ebb0db4f5
Merge pull request #233 from bfirsh/handle-json-errors
...
Handle JSON errors from the server
2016-06-02 21:23:51 +02:00
009ba1641d
Merge pull request #253 from allencloud/fix-typos
...
In unit tests fix a/an misuse
2016-06-02 09:54:05 +02:00
0a6de32493
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-02 13:27:56 +08:00
09f2e67b62
Merge pull request #242 from vdemeester/add-more-container-logs-tests
...
Add happy path test on ContainerLogs
2016-06-01 13:51:28 -07:00
e89edbf119
Merge pull request #244 from vdemeester/add-unit-test-to-events
...
Add unit tests to Events
2016-06-01 13:50:10 -07:00
f4e3fb72ce
Merge pull request #240 from WeiZhang555/conditional-url-value
...
Only set url value when it's not empty
2016-06-01 13:49:33 -07:00
b52c579b0b
Merge pull request #251 from mlaventure/oci-runtimes
...
Add support for using different OCI runtimes
2016-06-01 09:59:00 -07:00
6572414eca
Add unit tests for NewEnvClient
...
With some certificates in `testdata`.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-01 17:28:13 +02:00
818968bfff
Add support for using different OCI runtimes
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-01 08:06:44 -07:00
56ad47e075
Merge pull request #250 from yongtang/23055-docker-search-limit
...
Add `--limit` option to `docker search`
2016-06-01 16:01:45 +02:00
267c31abd8
Add `--limit` option to `docker search`
...
This fix is related to docker:
https://github.com/docker/docker/pull/23107
https://github.com/docker/docker/issues/23055
Currently docker search result caps at 25 and there is no way to allow getting more results (if exist).
This fix adds the flag --limit so that it is possible to return more results from the docker search.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-01 06:35:42 -07:00
dbdcba0b66
Merge pull request #245 from vdemeester/more-info-unit-tests
...
Add error unit tests for Info
2016-06-01 13:51:05 +02:00
c15549e103
Merge pull request #248 from michael-holzheu/seccomp_add_ppc_and_s390x
...
seccomp: Add ppc and s390x to types/seccomp.go
2016-06-01 13:27:26 +02:00
1b901696f6
Only set url value when it's not empty
...
Currently docker start API always contains a trailing `checkpoint=` even
if value is empty, this is unnecessary, we can set it only when it's not
empty.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-06-01 09:45:36 +08:00
060cfa8db2
Merge pull request #243 from vdemeester/add-more-container-stats
...
Add happy path test on ContainerStats
2016-05-31 18:16:25 -07:00
f015fc3f40
seccomp: Add ppc and s390x to types/seccomp.go
...
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-05-31 08:39:31 -04:00
9b41a1b340
Add error unit tests for Info
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-31 12:52:06 +02:00
21fd380f32
Add unit tests to Events
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-31 12:39:31 +02:00
f1f691d82f
Add happy path test on ContainerStats
...
Complete unit tests for `ContainerStats` by adding happy path cases :)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-31 11:30:20 +02:00
f14eb279d8
Merge pull request #241 from vdemeester/add-more-container-export-tests
...
Add happy path test on ContainerExport
2016-05-31 11:19:35 +02:00
55960d6e0b
Add a happy path test on ContainerExport
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-31 11:17:25 +02:00
ad5d94e69e
Add happy path test on ContainerLogs
...
Complete unit tests for `ContainerLogs` by adding happy path cases, and
complete potential errors coverage (with `Since` time parsing errors).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-31 11:15:14 +02:00
6facb3f3c3
Merge pull request #239 from yongtang/05292016-remove-deprecated-docker-tag-f
...
Remove deprecated -f flag on docker tag
2016-05-30 23:58:09 +02:00
a2ff4f5f8e
Remove deprecated -f flag on docker tag
...
This fix is related to docker:
https://github.com/docker/docker/pull/23090
The -f flag on docker tag has been deprecated in docker 1.10 and is
expected to be removed in docker 1.12.
This fix updated the associated files in engine-api.
Related tests have also been updated.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-29 10:14:38 -07:00
a0532698b5
Handle JSON errors from the server
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-05-26 18:08:49 -07:00
1b0ebe5e47
Add stutter to comments
...
This is a Go convention.
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
2016-05-26 16:05:15 -07:00
c9b5a47a3a
Merge pull request #237 from nishanttotla/fix-comments
...
Fix typos in comments
2016-05-26 08:52:53 +02:00
705e5e1a17
Fix typos in comments
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-25 17:50:50 -07:00
3d29ca0e95
Add health states as consts
...
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
2016-05-25 16:48:03 -07:00
98039b806f
Change some types
...
Requested by Stephen Day.
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
2016-05-25 16:33:52 -07:00
550e8f7e48
Update types to support HEALTHCHECK feature
...
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
2016-05-25 11:52:08 -07:00
0e47ff2493
Merge pull request #228 from HackToday/addrawapi
...
Add Raw interface for network,volume inspect
2016-05-23 08:30:36 -07:00
fe6e4b67e0
Add Raw interface for network,volume inspect
...
Closes : #207
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-05-23 01:57:39 +00:00
83e511bd6c
Merge pull request #232 from allencloud/add_field_description_in_types
...
add field description in types.go
2016-05-20 11:54:23 -07:00
12fbeb3ac3
Merge pull request #226 from vdemeester/add-onlyoneexactmatch-to-filters
...
Add a new UniqueExactMatch method to filters
2016-05-20 17:54:02 +02:00
00f6f958b9
Add a new UniqueExactMatch method to filters
...
It let us the possibility to validate that the filter is only present
once and thus can help validating boolean filters better.
For example, in docker/docker, right now, it is possible to pass
multiple filter values for the `dangling` boolean filter even if they
are not valid (i.e. --filter=dangling=toto --filter=dangling=true will
work even though we wanted only one value and a valid one).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-20 17:49:37 +02:00
99c07ad16f
Merge pull request #229 from LK4D4/drain_body
...
client: drain body to reuse connections
2016-05-20 16:53:51 +02:00
allencloud
David Calavera
Sebastiaan van Stijn
Joe Farrell
Vincent Demeester
Antonio Murdaca
Lei Jitang
Yong Tang
Ben Firshman
John Howard
Kenfe-Mickael Laventure
Antonio Murdaca
Zhang Wei
Michael Holzheu
Thomas Leonard
Nishant Totla
Kai Qiang Wu(Kennan)