Граф коммитов

9154 Коммитов

Автор SHA1 Сообщение Дата
Victor Vieux 10997922a2 remove IPAMConfigFamily
remove Reserved
add CACertHash
cleanup of types

Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-06-12 02:34:05 -07:00
Vincent Demeester a5e7f36af3 Add unit test for node endpoints
- NodeInspect
- NodeList
- NodeRemove
- NodeUpdate

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-09 00:55:05 -07:00
Vincent Demeester b0c1cb5c15 Add unit test for service endpoint
- ServiceCreate
- ServiceInspect
- ServiceList
- ServiceRemove
- ServiceUpdate

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-09 00:55:05 -07:00
Vincent Demeester d8a0f3efbe Add unit test for swarm endpoints
- SwarmInit
- SwarmInspect
- SwarmJoin
- SwarmLeave
- SwarmUpdate

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-09 00:55:05 -07:00
Vincent Demeester 418e265d9d Add unit test for task endpoints
- TaskInspect
- TaskList

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-09 00:55:05 -07:00
Victor Vieux 59bce4d452 remove MCSAaccessMode and split swarm.go and use NodeRole
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-09 00:55:05 -07:00
Victor Vieux 4eece3c2c5 Add swarmkit management API endpoints
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-09 00:55:05 -07:00
Alessandro Boch aa9e8e7ea8 Add list of link-local IPs to EndpointIPAMConfig
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-08 15:20:28 -07:00
Sebastiaan van Stijn d06b85b29e Merge pull request #267 from vdemeester/fix-client-tests
Fix TestNewEnvClient with default version
2016-06-08 18:28:35 +02:00
Vincent Demeester e22e8d0a75
Fix TestNewEnvClient with default version
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-08 18:24:19 +02:00
David Calavera c024c46c2a Merge pull request #252 from vdemeester/env-client-tests
Add unit tests for NewEnvClient
2016-06-08 09:13:44 -07:00
David Calavera 8d58f33176 Merge pull request #266 from vdemeester/versionned-json-error
Add a version check on client error handling
2016-06-08 09:11:43 -07:00
Vincent Demeester 5140421c5d
Add a version check on client error handling
In case the daemon API is older than 1.24 but the response has a
content-type of `application/json`, this make sure it's keeping the old
behavior before 1.24.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-08 11:04:56 +02:00
Vincent Demeester 3a30f2268c Merge pull request #264 from bfirsh/add-default-api-version
Add default version to NewEnvClient
2016-06-08 07:43:20 +02:00
Ben Firshman c822db730b Add warning about setting version in NewClient
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-06-07 15:22:30 -07:00
Ben Firshman ff58b66759 Add default version to NewEnvClient
Matches behaviour of CLI, and will stop apps breaking if they're
running off engine-api master, but not docker/docker master.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-06-07 15:22:30 -07:00
Morgan Bauer 39f9289421 Merge pull request #263 from vdemeester/revert-urls
Revert "Remove /json from API URLs"
2016-06-07 13:51:29 -07:00
Morgan Bauer cf94e9533d Merge pull request #261 from allencloud/change-Memory-type-in-ContainerNode
change Memory type to int64 in ContainerNode
2016-06-07 13:45:15 -07:00
Vincent Demeester 4065613c52
Revert "Remove /json from API URLs"
This reverts commit 73cef48eb7.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-07 21:04:50 +02:00
David Calavera 739ad1671b Merge pull request #255 from bfirsh/remove-json-from-api-urls
Remove /json from API URLs
2016-06-07 08:19:35 -07:00
David Calavera 8c2141e14b Merge pull request #235 from pdalpra/timeout-as-time.Duration
Use time.Duration as type for timeouts
2016-06-07 08:18:53 -07:00
Pierre Dal-Pra da7b0e73dd Use time.Duration as type for timeouts
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com>
2016-06-07 13:27:53 +02:00
Pierre Dal-Pra 2bb28fef8f Add helper to convert Duration to string
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com>
2016-06-07 13:27:37 +02:00
allencloud 31d0f31ae9 change Memory type to int64 in ContainerNode
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-07 11:48:08 +08:00
David Calavera 9245c24707 Merge pull request #238 from vdemeester/update-errors
Make NotFound Errors exportable
2016-06-06 18:18:15 -07:00
Sebastiaan van Stijn 8f30a1c59b Merge pull request #259 from joe2far/patch-1
Fixed typo in README
2016-06-05 19:12:17 +02:00
Joe Farrell 278b40576e Fixed typo in README
Signed-off-by: joe2far <joe2farrell@gmail.com>
2016-06-03 17:44:19 +01:00
Vincent Demeester 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
Vincent Demeester 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
Antonio Murdaca 3c95290e37 client: request: check only 'bad certificate'
This is because go1.7+ now prints 'tls: ' before
eede112492

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-03 15:36:53 +02:00
Lei Jitang 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
Yong Tang 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
Sebastiaan van Stijn 78e70eee96 Merge pull request #254 from jhowardmsft/shell
Add shell to support SHELL in dockerfile
2016-06-03 02:05:15 +02:00
Ben Firshman 73cef48eb7 Remove /json from API URLs
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-06-02 16:33:07 -07:00
John Howard 1837c8a53c Add shell to support SHELL in dockerfile
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-06-02 16:21:50 -07:00
Sebastiaan van Stijn fa04f66c78 Merge pull request #236 from talex5/healthcheck
Update types to support HEALTHCHECK feature
2016-06-02 23:38:33 +02:00
Sebastiaan van Stijn 1ebb0db4f5 Merge pull request #233 from bfirsh/handle-json-errors
Handle JSON errors from the server
2016-06-02 21:23:51 +02:00
Vincent Demeester 009ba1641d Merge pull request #253 from allencloud/fix-typos
In unit tests fix a/an misuse
2016-06-02 09:54:05 +02:00
allencloud 0a6de32493 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-02 13:27:56 +08:00
David Calavera 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
David Calavera 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
David Calavera 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
David Calavera b52c579b0b Merge pull request #251 from mlaventure/oci-runtimes
Add support for using different OCI runtimes
2016-06-01 09:59:00 -07:00
Vincent Demeester 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
Kenfe-Mickael Laventure 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
Sebastiaan van Stijn 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
Yong Tang 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
Antonio Murdaca 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
Vincent Demeester 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
Zhang Wei 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