toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,825 Commits 3 Branches 295 Tags
eefbd135ae8d69f0cc402ec8a4bfb7290e77a044
Commit Graph
33825 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenfe-Mickael Laventure 5305a1cd9e Update containerd to 06b9cb35161009dcb7123345749fef02f7cea8e0 
This also update:
 - runc to 3f2f8b84a77f73d38244dd690525642a72156c64
 - runtime-specs to v1.0.0

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 45d85c99139bbd16004bbedb7d5bac6a60264538
Component: engine
 2017-08-21 12:04:07 -07:00
Tobias Klauser 4f846a2e15 Use event functions from golang.org/x/sys/windows 
Use CreateEvent, OpenEvent (which both map to the respective *EventW
function) and PulseEvent from golang.org/x/sys instead of local copies.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: e942513ac46656c3f54cd103e990e2b7bd5c2b14
Component: engine
 2017-08-21 12:58:09 +02:00
Tobias Klauser 3bf60d04de vendor: re-vendor golang.org/x/sys 
Update golang.org/x/sys to 07c182904dbd53199946ba614a412c61d3c548f5 in
order to get the newly added Windows event functions which will be used
in successive commits.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: df58f40a47ea4ee462eb88d3e695bec93c99a6bb
Component: engine
 2017-08-21 12:48:05 +02:00
Yong Tang 1c65c425a3 Merge pull request #34560 from dnephin/remove-some-cli-tests 
Remove a couple cli tests, which are now unit tests in docker/cli
Upstream-commit: 361a473121f2cd4e688a3bb71fbeff00aaf674d7
Component: engine
 2017-08-19 14:31:05 -07:00
Yong Tang 0f9c6d96f0 Merge pull request #34551 from dnephin/use-gometalinter 
Use gometalinter for linting
Upstream-commit: 4c8cde597daf3d96f74d3b6c4ff3a23e51f8abd3
Component: engine
 2017-08-19 09:40:47 -07:00
Christophe Vidal 3c66acc139 Dropped hyphen in bind mount where appropriate 
Signed-off-by: Christophe Vidal <kriss@krizalys.com>
Upstream-commit: dffa5d6df2e51556edfbcebc4695fdbc0bcc1a90
Component: engine
 2017-08-19 21:25:07 +07:00
Simon Vikstrom bffaf97a87 Remove double defined alarm 
Signed-off-by: Simon Vikstrom <pullreq@devsn.se>
Upstream-commit: d7bf5e3b4db05b64d969127f6465f47cf4fe97d0
Component: engine
 2017-08-19 09:55:03 +02:00
John Howard 3153600b5a Move to a single tag-store 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7b9a8f460bfa55dacca74f2ed0164323811e1196
Component: engine
 2017-08-18 17:09:27 -07:00
Yong Tang b47e1bb237 Merge pull request #34539 from fcrisciani/ln-vendoring 
Libnetwork vendoring
Upstream-commit: 0e0b8530210729bd7cd7fa87bf583e0c83652651
Component: engine
 2017-08-18 14:11:58 -07:00
Yong Tang a82f513c02 Merge pull request #34552 from dnephin/add-integration-validation 
Add validation for integration-cli deprecation
Upstream-commit: 2ad59cd901eb651665665bff9c2916ab50d5d4b0
Component: engine
 2017-08-18 14:09:21 -07:00
Liron Levin 3fa5ba0a1e plugable secret backend - update vendor.conf 
Updating swarmkit dependencies.

Add more parameters for the secret driver API.

Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: 3b8d36d0646137c4315cfa12df0dcd49b584d22a
Component: engine
 2017-08-18 21:52:26 +03:00
Daniel Nephin 39c495c1d1 Remove config tests, which are now unit tests in docker/cli 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c467a112050d595ca0b48122cd4ce81fcf6cefde
Component: engine
 2017-08-18 14:24:52 -04:00
Daniel Nephin 3995851d84 Add a validation for integration-cli deprecation. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 89c0c5feb28c01dfc4e026b98107ca07c8d6c956
Component: engine
 2017-08-18 14:24:32 -04:00
Daniel Nephin de626e10fb Fix golint errors. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9b47b7b1519c5f2138e2933fb1fc459eb00895c0
Component: engine
 2017-08-18 14:23:44 -04:00
Daniel Nephin 63a6b47bce Use gometalinter for linting 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d7e2c4ce773b3a54f47e84a5a1ef22eb72c978b5
Component: engine
 2017-08-18 14:23:43 -04:00
Florian Noeding ce23144495 Fixed raw mode splunk logger 
Splunk HEC does not accept log events with an empty string or a
whitespace-only string.

Signed-off-by: Florian Noeding <florian@noeding.com>
Upstream-commit: 5f6d6a5093a4db799f9c1a6bb82eed1eea13ec0c
Component: engine
 2017-08-18 12:03:43 +02:00
John Stephens 8cb69b8ef5 Merge pull request #34405 from Microsoft/jjh/lcowworkdir 
LCOW: WORKDIR correct handling
Upstream-commit: 30eb4d8cdc422b023d5f11f29a82ecb73554183b
Component: engine
 2017-08-17 21:16:36 -05:00
Akihiro Suda 8de8152c0b Merge pull request #34548 from dnephin/remove-some-cli-tests 
Remove a couple cli-only tests from integration-cli
Upstream-commit: 098a7b3d53ae8267ec95e2935316b0e62b483b02
Component: engine
 2017-08-18 10:03:45 +09:00
John Howard 0acc3ead17 LCOW: WORKDIR correct handling 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9fa449064cc499871d49f02b96a7e69c071ce50c
Component: engine
 2017-08-17 15:29:17 -07:00
Tibor Vass dd8d1a11c6 Merge pull request #34407 from dnephin/add-TESTING-doc 
[Proposal] Document testing guidelines
Upstream-commit: 867a5999cefccefb3e0fb79ffa22f01dd7c1a5e1
Component: engine
 2017-08-17 12:33:43 -07:00
Daniel Nephin 379cbb4ffb Merge pull request #34547 from dnephin/add-myself-to-CODEOWNERS 
Add myself to CODEOWNERS for integration suite
Upstream-commit: 81cd5e441ad87ae85d5f721f2dfa8c6d8c9141d7
Component: engine
 2017-08-17 13:26:33 -04:00
Daniel Nephin c1824669c3 Add myself to CODEOWNERS for integration suite. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9b094fc4a3845c1f1c8aed9730421aab096dadc1
Component: engine
 2017-08-17 13:03:47 -04:00
Daniel Nephin dc46befdc9 Remove cli-only tests from integration-cli 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 98d8c96885593f8f085bf9607b7d817e23d7164c
Component: engine
 2017-08-17 12:32:49 -04:00
Yong Tang 5478a26336 Merge pull request #34528 from adshmh/client-should-return-image-not-found-for-404-status 
client to return imageNotFound error if API returns 404 status code
Upstream-commit: db73f3daee21a28edbf6991d24a4653adc85f1a2
Component: engine
 2017-08-16 13:18:00 -07:00
Yong Tang 1c8e4b07c7 Merge pull request #34536 from thaJeztah/fix-makefile-warning 
Fix make test-unit printing deprecation warning
Upstream-commit: 8bee1e9a3ba0884cf1bb0d7fa069fb3c5722af51
Component: engine
 2017-08-16 11:16:04 -07:00
Flavio Crisciani 2170bca7b5 Libnetwork vendoring 
- lock OS thread in overlay driver operation

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: 85706876471400716f2b37ca0a0bbd75128fc412
Component: engine
 2017-08-16 09:48:12 -07:00
Yong Tang 9156c95e0a Merge pull request #34188 from cpuguy83/32144_api_error_handling 
Remove string checking in API error handling
Upstream-commit: 2afb3efaa63537cc152437af3cd7a6743fcb3d8d
Component: engine
 2017-08-16 08:53:15 -07:00
Sebastiaan van Stijn 3d5737e04c Fix make test-unit printing deprecation warning 
Commit 1fb615599a83f41b449529df24f7e833c727e0ed moved the unit tests out
of `hack/make.sh`, however the Makefile still used the old path, resulting
in a warning being printed when the unit tests were run:

    ---> Making bundle: test-unit (in bundles/17.06.0-dev/test-unit)
    DEPRECATED: use hack/test/unit instead of hack/make.sh test-unit

This patch updates the Makefile to use the new command.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c500bb562f6dfd1ae4a77f3a66175089ff8f74e8
Component: engine
 2017-08-16 16:02:04 +02:00
Sebastiaan van Stijn 8a95291c98 Merge pull request #34485 from thaJeztah/swagger-updates 
Various fixes and improvements to the API docs / Swagger specs
Upstream-commit: 3d843e81d0cabe8d341f24f63d71548bc0ffd376
Component: engine
 2017-08-16 14:29:06 +02:00
Sebastiaan van Stijn ee29bacf1d Create definition for SystemInfo response 
The `/info` endpoint was badly documented, missing various
fields and incorrectly describing others.

This patch defines a type for the endpoint, based on the
API types in the source.

Also removing the response example in favor of
per-field examples, as this prevents an incorrectly
formatted response from masking omissions in the
actual type.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 18b23067be82054a6384fc5934ecbb0276d1862b
Component: engine
 2017-08-16 11:11:29 +02:00
Sebastiaan van Stijn 81aceb39fb Remove redundant example for Node 
All example values are now documented per field,
so are automatically used to generate responses.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2720cefbb2eaac9f440cd7c1807b4222b18ee0c4
Component: engine
 2017-08-16 11:11:19 +02:00
Sebastiaan van Stijn 031f55b2f7 Add definition for Swarm inspect response 
Also remove inline response examples

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5b017ef45d68748b8f4065db137aa55e1ff0e8ab
Component: engine
 2017-08-16 11:11:14 +02:00
Sebastiaan van Stijn 3a37403bb9 Extract NodeDescription to a separate definition 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 33e2c994015cbc8f7e86bc1b764e17a7470a17ac
Component: engine
 2017-08-16 11:11:09 +02:00
Sebastiaan van Stijn 54e785932e Extract EngineDescription to a separate definition 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7cb4a97ae195bce55b0a2e54e08b3cd1b4b190af
Component: engine
 2017-08-16 11:11:04 +02:00
Sebastiaan van Stijn 4645cfda21 Extract Platform to a separate definition 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a2de2681a65d034ffb231b15b630b5a053608331
Component: engine
 2017-08-16 11:10:58 +02:00
Sebastiaan van Stijn d0c8aa84bd Add missing definition for Node.ManagerStatus 
The `Node.ManagerStatus`  property was only present in
the example, but not in the definition.

This patch adds definitions for `ManagerStatus`
and `Reachability`, similar to what is used in the
code;
https://github.com/moby/moby/blob/f02a5b50c407bdb087388e18e1ac619f2788dd8d/api/types/swarm/node.go#L84-L101

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3f1ad79faf3bfecc19722eb6541bb415024dafe4
Component: engine
 2017-08-16 11:10:53 +02:00
Sebastiaan van Stijn 9fee66bce7 Add missing definition for Node.Status 
The `Node.Status`  property was only present in
the example, but not in the definition.

This patch adds definitions for `NodeStatus`
and `NodeState`, similar to what is used in the
code;

- https://github.com/moby/moby/blob/f02a5b50c407bdb087388e18e1ac619f2788dd8d/api/types/swarm/node.go#L77-L82
- https://github.com/moby/moby/blob/f02a5b50c407bdb087388e18e1ac619f2788dd8d/api/types/swarm/node.go#L103-L115

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 26b247e706e613af5214e4a89de375128f3368dd
Component: engine
 2017-08-16 11:10:47 +02:00
Sebastiaan van Stijn 6526a15536 Fix TLSInfo in Node specification 
- `TLSInfo` is part of `Node.Description`, but was documented as a
  direct child of `Node`
- `Node.TLSInfo` incorrectly was using the `SwarmSpec` type,
  instead of `TLSInfo`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b2de157a41bbd18ca4317792614e8630d73a7102
Component: engine
 2017-08-16 11:10:42 +02:00
Sebastiaan van Stijn d3b3ce345c Update incorrect types in Swagger 
- `ObjectVersion.Index` is an `uint64` https://github.com/moby/moby/blob/0fd90c4d5d8ab739d6f999a36d9c4096e89c8059/api/types/swarm/common.go#L5-L15
- `ClusterInfo` is nullable in the `/info` output (see https://github.com/moby/moby/blob/ff4f700f74450018f36d014f3cde0ff1b9c17fb3/api/types/swarm/swarm.go#L203)
- `CAConfig.ForceRotate` was missing a type, therefore treated as an `object` in Swagger: https://github.com/moby/moby/blob/ff4f700f74450018f36d014f3cde0ff1b9c17fb3/api/types/swarm/swarm.go#L121
- `Raft.SnapshotInterval`, `Raft.KeepOldSnapshots`, and `Raft.LogEntriesForSlowFollowers` are an `uint64` not an `int64`
- Various fields in `swarm.Info` are nullable; added `x-nullable`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 93e324e2a7b8131414382b6fb38b69f0d09bc30c
Component: engine
 2017-08-16 11:10:32 +02:00
Sebastiaan van Stijn da62e48708 Update / add extra description fields to Swagger 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 934378bee3846b1f0b790d3ee185d161900cb953
Component: engine
 2017-08-16 11:10:27 +02:00
Sebastiaan van Stijn d01174e4e5 Add extra example values to definitions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fa05a53426da6183199a97071e3d60a6d41a39be
Component: engine
 2017-08-16 11:10:22 +02:00
Sebastiaan van Stijn 8a9c9ec9a9 Reformat definitions - add some whitespace 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f720f9cc33e1be12b767f5066511266d87a7673b
Component: engine
 2017-08-16 11:10:14 +02:00
Sebastiaan van Stijn 12bfda3c10 Merge pull request #34478 from thaJeztah/fix-swagger-todos 
Update NetworkConfig definition in Swagger
Upstream-commit: 1454015ce96510fb677ab85bf26610f559a0c613
Component: engine
 2017-08-16 11:07:25 +02:00
Douglas Curtis 934616e542 Replacing os.Lstat with os.Stat to determine directory status in CopyInfoDestinationPath 
Signed-off-by: Douglas Curtis <dougcurtis1@gmail.com>

Commenting out tests for now

Signed-off-by: Doug Curtis <dougcurtis1@gmail.com>

Added unit test for CopyInfoDestionationPath.

Signed-off-by: Doug Curtis <dougcurtis1@gmail.com>

Removing integration-cli test case additions

Signed-off-by: Doug Curtis <dougcurtis1@gmail.com>

Removing extra spaces between archive_unix_test.go test cases

Signed-off-by: Doug Curtis <dougcurtis1@gmail.com>

Fixed gofmt issues in archive_unix_test.go

Signed-off-by: Doug Curtis <dougcurtis1@gmail.com>
Upstream-commit: cd7489f2b745578e0d8855aa44213b07b495f86f
Component: engine
 2017-08-15 23:19:42 +00:00
Arash Deshmeh e89e83b8bc client should return imageNotFound error when API returns 404 status code 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 33d82b78d03f7db4ef743951c6a004ba4fe64637
Component: engine
 2017-08-15 17:16:02 -04:00
Brian Goff 30f1b651e2 Remove string checking in API error handling 
Use strongly typed errors to set HTTP status codes.
Error interfaces are defined in the api/errors package and errors
returned from controllers are checked against these interfaces.

Errors can be wraeped in a pkg/errors.Causer, as long as somewhere in the
line of causes one of the interfaces is implemented. The special error
interfaces take precedence over Causer, meaning if both Causer and one
of the new error interfaces are implemented, the Causer is not
traversed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ebcb7d6b406fe50ea9a237c73004d75884184c33
Component: engine
 2017-08-15 16:01:11 -04:00
Sebastiaan van Stijn 13f12ea9ac Merge pull request #34508 from Microsoft/jjh/mergestorageopt 
Merge global storage options on create
Upstream-commit: cd902848e913aead3e8242eca8a6ed6c67e589e1
Component: engine
 2017-08-15 18:13:13 +02:00
Madhu Venugopal e80c7b1a0c Merge pull request #34504 from fcrisciani/ln-vendoring 
Libnetwork vendoring
Upstream-commit: 036314622de7cfc62b5f9a88c849faf17c9bc1d3
Component: engine
 2017-08-15 08:06:26 -07:00
Brian Goff 7eea9c9616 Merge pull request #34109 from yummypeng/rm-link-when-rm-container 
Bugfix: Remove links when remove container
Upstream-commit: b6498340b2baa6596553b2b56b43990a365a7b6a
Component: engine
 2017-08-15 09:43:00 -04:00
Yong Tang 9522e0432e Merge pull request #33450 from naveed-jamil-tenpearls/pkg/signal/trap 
Add test coverage to signal/trap.go
Upstream-commit: 479cc38bb94178d48609def34dfb0eae87a9a815
Component: engine
 2017-08-15 00:53:37 -07:00