beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29645 commits 14 branches 412 tags 338 MiB
Commit graph

2572 commits

Author SHA1 Message Date
Sebastiaan van Stijn
e94a40cdda Merge pull request #29041 from aaronlehmann/hide-updatestatus 
api: Hide UpdateStatus when it is not present
 2016-12-08 13:55:13 +01:00
Tõnis Tiigi
dca76ed50a Merge pull request #29104 from duglin/Issue29084 
Fix processing of unset build-args during build
 2016-12-07 17:18:55 -08:00
Tõnis Tiigi
a039ca9aff Merge pull request #29139 from ehazlett/fix-api-cors-exec 
Add headers when using exec
 2016-12-07 17:10:31 -08:00
Tõnis Tiigi
51b422ce6a Merge pull request #29213 from yongtang/12072016-typo-swagger-yaml 
Fix a couple of incorrect version strings in swagger.yaml
 2016-12-07 16:47:49 -08:00
Vincent Demeester
9468d687ac Merge pull request #29062 from erxian/refine-api-swagger.yaml-towards-image-create-status-code 
refine api swagger.yaml towards image create status code
 2016-12-07 22:03:54 +01:00
Yong Tang
887c4188f4 Fix a couple of incorrect version string in swagger.yaml 
This fix fixes a couple of incorrect version strings in swagger.yaml
`v1.25` should be `v1.26`. This applies to 1.14 version only.

Also checked 1.13rc and it is fine.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-12-07 08:11:12 -08:00
Doug Davis
cdb8ea90b0 Fix processing of unset build-args during build 
This reverts 26103.  26103 was trying to make it so that if someone did:
  docker build --build-arg FOO .
and FOO wasn't set as an env var then it would pick-up FOO from the
Dockerfile's ARG cmd.  However, it went too far and removed the ability
to specify a build arg w/o any value. Meaning it required the --build-arg
param to always be in the form "name=value", and not just "name".

This PR does the right fix - it allows just "name" and it'll grab the value
from the env vars if set. If "name" isn't set in the env then it still needs
to send "name" to the server so that a warning can be printed about an
unused --build-arg. And this is why buildArgs in the options is now a
*string instead of just a string - 'nil' == mentioned but no value.

Closes #29084

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-12-07 07:41:55 -08:00
erxian
15be050fb3 refine api swagger.yaml towards image create status code 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2016-12-07 10:27:40 +08:00
Evan Hazlett
f86db80b5f add headers when using exec 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

ensure headers are properly sanitized

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-12-06 14:27:34 -05:00
Sebastiaan van Stijn
f687eb576f Merge pull request #29166 from allencloud/add-403-for-network-create-endpoint 
add 403 for endpoint network create
 2016-12-06 11:47:28 +01:00
Vincent Demeester
745795ef2e Merge pull request #28535 from yongtang/28497-prune-until 
Convert DanglingOnly to Filters for `docker image prune`
 2016-12-06 11:03:45 +01:00
allencloud
0d21e24b9f add 403 for endpoint network create 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-12-06 14:36:50 +08:00
Brian Goff
1f09d68a6e Merge pull request #29123 from vdemeester/29116-compose-to-swarm-logging 
Handle logging in compose to swarm
 2016-12-05 20:39:08 -05:00
Tibor Vass
1c96879f1e Merge pull request #28963 from vieux/refactor_plugin_install 
refactor plugin install
 2016-12-05 12:00:29 -08:00
unclejack
c1ce63b17b api/types/container,client: gofmt 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2016-12-05 17:00:36 +02:00
Vincent Demeester
806cc1e0f8
Handle logging in compose to swarm 
Logging configuration was completely ignore when deploy a compose file
to swarm. This fixes it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-05 15:18:36 +01:00
Yong Tang
a6be56b54e Convert DanglingOnly to Filters for docker image prune 
This fix convert DanglingOnly in ImagesPruneConfig to Filters,
so that it is possible to maintain API compatibility in the future.

Several integration tests have been added to cover changes.

This fix is related to 28497.

A follow up to this PR will be done once this PR is merged.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-12-02 20:08:49 -08:00
Brian Goff
3cb310c210 Merge pull request #28988 from vdemeester/28985-dont-validate-hostname 
Remove hostname validation as it seems to break users
 2016-12-02 21:16:56 -05:00
Sebastiaan van Stijn
535db46be5 Merge pull request #28349 from allencloud/add-missing-code-in-api-docs 
add missing status code of swarm cluster in api 1.24
 2016-12-03 02:04:05 +01:00
Victor Vieux
30db51c169 update docs 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-12-02 15:24:11 -08:00
Victor Vieux
fa3b61a28f refactor plugin install 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-12-02 15:23:08 -08:00
Ben Firshman
30a9249e15
Use singular tag names in swagger.yaml 
This is required to make the type generation put things in the
correct directory, but unfortunately makes the names in the
documentation menu look a bit crap.

I think the best solution would be to add a `x-display-name`
extension to tags to determine how the tags show up in the menu,
rather than it depend on the name of the tag. I shall do this in
a follow-up PR - for now, let's fix the breakage.

Fixes #29045

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-12-02 14:14:36 +00:00
allencloud
9a1f7b6b0b add missing status code in api docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-12-02 11:24:45 +08:00
Aaron Lehmann
0e70d96a68 api: Hide UpdateStatus when it is not present 
When UpdateStatus was not present, the empty values of the timestamps
would be present:

        "UpdateStatus": {
            "StartedAt": "0001-01-01T00:00:00Z",
            "CompletedAt": "0001-01-01T00:00:00Z"
        }

To fix this, make the timestamps pointers, so they can be set to nil
when they should not be shown.

Also make UpdateStatus itself a pointer, so an empty object does not
show up when there is no UpdateStatus.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-01 15:08:41 -08:00
Sebastiaan van Stijn
457d562af1 Merge pull request #28917 from erxian/correct-secret-remove-http-return-code 
correct the http return code of secret remove
 2016-11-30 22:47:28 +01:00
Vincent Demeester
ef39256dfb
Remove hostname validation as it seems to break users 
Validation is still done by swarmkit on the service side.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-30 19:22:07 +01:00
Sebastiaan van Stijn
643b1c0175 Merge pull request #28840 from bfirsh/2016-11-25-api-docs 
Updates to swagger.yaml and API documentation
 2016-11-30 15:49:25 +01:00
erxian
21768933fb correct the http return code of secret remove 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2016-11-30 19:45:45 +08:00
Dong Chen
abcb699ad1 Fix network attachable option. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-11-28 16:54:56 -08:00
Vincent Demeester
c6e31454ba
Fixes ImageList to be retro-compatible with older API 
Make sure current client code can talk for ImageList can still talk to
older daemon.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 22:15:50 +01:00
Vincent Demeester
e517d7975e
AcceptedFilters in router/network/filter.go should not be exported 
It's not used elsewhere and doesn't need to be exported.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 14:14:50 +01:00
Ben Firshman
bf6a790f00
Make swagger.yaml operationIds consistent 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:26 +00:00
Ben Firshman
54051b18a1
Make docs URLs in swagger.yaml absolute 
This makes the swagger.yaml useful outside of the documentation.
For background:
https://github.com/docker/docker.github.io/pull/606#issuecomment-261389645

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:26 +00:00
Ben Firshman
2aea9ad56b
Improve tags in swagger.yaml 
- Consistent naming (plural, etc)
- Add section descriptions
- Add docs in swagger.yaml about how to maintain them

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:25 +00:00
Ben Firshman
be52738a2c
Add intro to swagger.yaml to explain what it's for 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:25 +00:00
Victor Vieux
22ba220e86 Merge pull request #28727 from cyli/do-not-display-secret-digest 
Do not display the digest or size of swarm secrets [1.13]
 2016-11-22 16:44:06 -08:00
Anusha Ragunathan
23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes 
Plugin miscellaneous fixes
 2016-11-22 16:12:37 -08:00
cyli
fe127b7eae Update docs to reflect no longer displaying secret digest or size. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-22 18:18:56 -05:00
cyli
2c0613540a Do not display the digest or size of swarm secrets 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-22 18:13:27 -05:00
Victor Vieux
c025d56504 Merge pull request #28691 from aluzzardi/service-logs-no-follow 
[experimental] service logs: Support no-follow mode
 2016-11-22 13:48:14 -08:00
Sebastiaan van Stijn
313502488e Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs 
Prepare docs and Swagger definition for automatically generated API docs
 2016-11-22 22:47:38 +01:00
Tibor Vass
677e14643c Merge pull request #28595 from anusha-ragunathan/plugin_timeout 
Allow HTTP client timeout to be configurable on plugin enable.
 2016-11-22 10:17:10 -08:00
Victor Vieux
772a423e08 Merge pull request #28529 from allencloud/update-secret-create-url 
fix secret create url for consistency
 2016-11-22 09:55:17 -08:00
Tibor Vass
53b9b99e5c plugins: support for devices 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-11-22 09:54:45 -08:00
Ben Firshman
109c54c481
Add documentation for working on Engine API 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 16:46:57 +00:00
Ben Firshman
44c50807c6
Update swagger.yaml with changes to API 
Up to and including 673c5ee559

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 12:49:38 +00:00
Ben Firshman
c97f67dbab
Add version information to swagger.yaml 
- Tidied up copy
- API version is now mandatory
- Links to previous API versions

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 12:49:38 +00:00
Ben Firshman
f0d55cd081
Rename Remote API to Engine API 
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 12:49:38 +00:00
Vincent Demeester
48c3df015d Merge pull request #28651 from YuPengZTE/devMD002 
First header should be a top level header
 2016-11-22 13:11:37 +01:00
yupeng
c471b7f243 hack/swagger-gen.sh is not exist, it should be /hack/generate-swagger-api.sh 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-22 16:32:32 +08:00