Yong Tang
28362f11d7
Merge pull request #34572 from krizalys/hyphenless-bind-mount
...
Dropped hyphen in bind mount where appropriate
2017-08-22 05:11:46 -07:00
Yong Tang
361a473121
Merge pull request #34560 from dnephin/remove-some-cli-tests
...
Remove a couple cli tests, which are now unit tests in docker/cli
2017-08-19 14:31:05 -07:00
Yong Tang
4c8cde597d
Merge pull request #34551 from dnephin/use-gometalinter
...
Use gometalinter for linting
2017-08-19 09:40:47 -07:00
Christophe Vidal
dffa5d6df2
Dropped hyphen in bind mount where appropriate
...
Signed-off-by: Christophe Vidal <kriss@krizalys.com >
2017-08-19 21:25:07 +07:00
Yong Tang
0e0b853021
Merge pull request #34539 from fcrisciani/ln-vendoring
...
Libnetwork vendoring
2017-08-18 14:11:58 -07:00
Yong Tang
2ad59cd901
Merge pull request #34552 from dnephin/add-integration-validation
...
Add validation for integration-cli deprecation
2017-08-18 14:09:21 -07:00
Daniel Nephin
c467a11205
Remove config tests, which are now unit tests in docker/cli
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-08-18 14:24:52 -04:00
Daniel Nephin
89c0c5feb2
Add a validation for integration-cli deprecation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-08-18 14:24:32 -04:00
Daniel Nephin
9b47b7b151
Fix golint errors.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-08-18 14:23:44 -04:00
Daniel Nephin
d7e2c4ce77
Use gometalinter for linting
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-08-18 14:23:43 -04:00
John Stephens
30eb4d8cdc
Merge pull request #34405 from Microsoft/jjh/lcowworkdir
...
LCOW: WORKDIR correct handling
2017-08-17 21:16:36 -05:00
Akihiro Suda
098a7b3d53
Merge pull request #34548 from dnephin/remove-some-cli-tests
...
Remove a couple cli-only tests from integration-cli
2017-08-18 10:03:45 +09:00
John Howard
9fa449064c
LCOW: WORKDIR correct handling
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2017-08-17 15:29:17 -07:00
Tibor Vass
867a5999ce
Merge pull request #34407 from dnephin/add-TESTING-doc
...
[Proposal] Document testing guidelines
2017-08-17 12:33:43 -07:00
Daniel Nephin
81cd5e441a
Merge pull request #34547 from dnephin/add-myself-to-CODEOWNERS
...
Add myself to CODEOWNERS for integration suite
2017-08-17 13:26:33 -04:00
Daniel Nephin
9b094fc4a3
Add myself to CODEOWNERS for integration suite.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-08-17 13:03:47 -04:00
Daniel Nephin
98d8c96885
Remove cli-only tests from integration-cli
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-08-17 12:32:49 -04:00
Yong Tang
db73f3daee
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
2017-08-16 13:18:00 -07:00
Yong Tang
8bee1e9a3b
Merge pull request #34536 from thaJeztah/fix-makefile-warning
...
Fix make test-unit printing deprecation warning
2017-08-16 11:16:04 -07:00
Flavio Crisciani
8570687647
Libnetwork vendoring
...
- lock OS thread in overlay driver operation
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
2017-08-16 09:48:12 -07:00
Yong Tang
2afb3efaa6
Merge pull request #34188 from cpuguy83/32144_api_error_handling
...
Remove string checking in API error handling
2017-08-16 08:53:15 -07:00
Sebastiaan van Stijn
c500bb562f
Fix make test-unit printing deprecation warning
...
Commit 1fb615599a 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 >
2017-08-16 16:02:04 +02:00
Sebastiaan van Stijn
3d843e81d0
Merge pull request #34485 from thaJeztah/swagger-updates
...
Various fixes and improvements to the API docs / Swagger specs
2017-08-16 14:29:06 +02:00
Sebastiaan van Stijn
18b23067be
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 >
2017-08-16 11:11:29 +02:00
Sebastiaan van Stijn
2720cefbb2
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 >
2017-08-16 11:11:19 +02:00
Sebastiaan van Stijn
5b017ef45d
Add definition for Swarm inspect response
...
Also remove inline response examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-16 11:11:14 +02:00
Sebastiaan van Stijn
33e2c99401
Extract NodeDescription to a separate definition
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-16 11:11:09 +02:00
Sebastiaan van Stijn
7cb4a97ae1
Extract EngineDescription to a separate definition
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-16 11:11:04 +02:00
Sebastiaan van Stijn
a2de2681a6
Extract Platform to a separate definition
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-16 11:10:58 +02:00
Sebastiaan van Stijn
3f1ad79faf
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;
f02a5b50c4/api/types/swarm/node.go (L84-L101)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-16 11:10:53 +02:00
Sebastiaan van Stijn
26b247e706
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;
- f02a5b50c4/api/types/swarm/node.go (L77-L82)
- f02a5b50c4/api/types/swarm/node.go (L103-L115)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-16 11:10:47 +02:00
Sebastiaan van Stijn
b2de157a41
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 >
2017-08-16 11:10:42 +02:00
Sebastiaan van Stijn
93e324e2a7
Update incorrect types in Swagger
...
- `ObjectVersion.Index` is an `uint64` 0fd90c4d5d/api/types/swarm/common.go (L5-L15)
- `ClusterInfo` is nullable in the `/info` output (see ff4f700f74/api/types/swarm/swarm.go (L203) )
- `CAConfig.ForceRotate` was missing a type, therefore treated as an `object` in Swagger: ff4f700f74/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 >
2017-08-16 11:10:32 +02:00
Sebastiaan van Stijn
934378bee3
Update / add extra description fields to Swagger
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-16 11:10:27 +02:00
Sebastiaan van Stijn
fa05a53426
Add extra example values to definitions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-16 11:10:22 +02:00
Sebastiaan van Stijn
f720f9cc33
Reformat definitions - add some whitespace
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-16 11:10:14 +02:00
Sebastiaan van Stijn
1454015ce9
Merge pull request #34478 from thaJeztah/fix-swagger-todos
...
Update NetworkConfig definition in Swagger
2017-08-16 11:07:25 +02:00
Arash Deshmeh
33d82b78d0
client should return imageNotFound error when API returns 404 status code
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
2017-08-15 17:16:02 -04:00
Brian Goff
ebcb7d6b40
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 >
2017-08-15 16:01:11 -04:00
Sebastiaan van Stijn
cd902848e9
Merge pull request #34508 from Microsoft/jjh/mergestorageopt
...
Merge global storage options on create
2017-08-15 18:13:13 +02:00
Madhu Venugopal
036314622d
Merge pull request #34504 from fcrisciani/ln-vendoring
...
Libnetwork vendoring
2017-08-15 08:06:26 -07:00
Brian Goff
b6498340b2
Merge pull request #34109 from yummypeng/rm-link-when-rm-container
...
Bugfix: Remove links when remove container
2017-08-15 09:43:00 -04:00
Yong Tang
479cc38bb9
Merge pull request #33450 from naveed-jamil-tenpearls/pkg/signal/trap
...
Add test coverage to signal/trap.go
2017-08-15 00:53:37 -07:00
Sebastiaan van Stijn
b98ceb7121
Update NetworkConfig definition in Swagger
...
This patch updates the definition of `NetworkConfig` to match the code, and
renames to the definition to `NetworkSettings` (also to match the type in
the code).
Add definitions for:
- `Address`
- `PortMap`
- `PortBinding`
- `EndpointIPAMConfig`
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-15 09:39:41 +02:00
John Howard
932ae425e8
Merge global storage options on create
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2017-08-14 15:47:54 -07:00
Victor Vieux
f148337da9
Merge pull request #34487 from tonistiigi/host-suffix-fix
...
Fix requests for docker host ending with slash
2017-08-14 13:29:02 -07:00
Flavio Crisciani
167564a798
Libnetwork vendoring
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
2017-08-14 09:31:23 -07:00
Daniel Nephin
07227a1227
Merge pull request #34492 from AkihiroSuda/fix-integration-cli-on-swarm
...
Fix `make build-integration-cli-on-swarm`
2017-08-14 12:20:18 -04:00
Yong Tang
e4c19aa529
Merge pull request #34419 from keloyang/config.v2.json
...
security: Chmod config.v2.json to 0600
2017-08-14 08:39:58 -07:00
Sebastiaan van Stijn
af3a9e3314
Merge pull request #34486 from kolyshkin/dm-misc
...
Misc fixes for devmapper
2017-08-14 17:20:40 +02:00