Alessandro Boch
beebfc0cf6
Fix api server null pointer def on inspect/ls null ipam-driver networks
...
- When a network is created with the null ipam driver, docker api server
thread will deference a nil pointer on `docker network ls` and on
`docker network inspect <nw>`. This because buildIpamResource()
assumes a gateway address is always present, which is not correct.
Signed-off-by: Alessandro Boch <aboch@tetrationanalytics.com >
2017-08-03 13:35:58 -07:00
John Howard
8af4db6f00
Merge pull request #34272 from dmcgowan/update-logrus
...
Update logrus to v1.0.1 (Sirupsen -> sirupsen)
2017-08-01 18:53:33 -07:00
Sebastiaan van Stijn
1a0fbc4a6f
Merge pull request #34287 from thaJeztah/bump-api-version
...
Bump API version to 1.32
2017-08-01 12:18:26 +02:00
Vincent Demeester
0fd90c4d5d
Merge pull request #34202 from thaJeztah/swagger-external-secrets-store
...
Add API documentation for plugable secret backends
2017-08-01 10:59:08 +02:00
Victor Vieux
3364e7da3f
Merge pull request #34302 from abhinandanpb/predefinednet
...
Changing the get network request to return swarm scope predefined net…
2017-07-31 17:08:04 -07:00
Derek McGowan
1009e6a40b
Update logrus to v1.0.1
...
Fixes case sensitivity issue
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
2017-07-31 13:16:46 -07:00
Abhinandan Prativadi
5bfefb2d36
Changing the get network request to return swarm scope predefined networks
...
Starting 17.06 swarm service create supports service creates with predefined
networks like host and bridge. Due to the nature of the feature, swarm manager
has a swarm scope predefined networks in addition to local scoped
predefined networks on all nodes. However network inspects for swarm scoped
predefined networks was not possible. The fix adds support for network inspect
for swarm scoped predefined networks.
Signed-off-by: Abhinandan Prativadi <abhi@docker.com >
2017-07-31 13:05:30 -07:00
Sebastiaan van Stijn
c8dad44c32
Add API documentation for plugable secret backends
...
Documents the API changes introduced in
0304c98d8508f7cf0526github@gone.nl >
2017-07-28 00:00:53 +02:00
Sebastiaan van Stijn
05121d5554
Bump API version to 1.32
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-07-27 18:50:31 +02:00
Sebastiaan van Stijn
4735c76632
Update API plugin response examples
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-07-27 18:43:13 +02:00
Sebastiaan van Stijn
36e4e952f8
Merge pull request #34247 from thaJeztah/fix-restartpolicy-default
...
Fix RestartPolicy default value
2017-07-27 00:21:48 +02:00
Brian Goff
1ea52c4812
Merge pull request #34249 from thaJeztah/remove-unused-constants
...
Remove unused constants in plugin_responses
2017-07-26 16:44:51 -04:00
Brian Goff
9319a8a2dd
Merge pull request #33440 from RenaudWasTaken/genericresource
...
Added support for Generic Resources
2017-07-25 15:32:25 -04:00
Sebastiaan van Stijn
9bb57aa3fe
Remove unused constants in plugin_responses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-07-25 17:07:04 +02:00
Sebastiaan van Stijn
fc48b5529d
Fix RestartPolicy default value
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-07-25 16:14:59 +02:00
Renaud Gaubert
87e1464c43
Added support for Generic Resources
...
Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com >
2017-07-24 17:49:56 -07:00
Sebastiaan van Stijn
901fe35bd3
Merge pull request #34174 from aaronlehmann/logattributes
...
Avoid using a map for log attributes
2017-07-21 22:31:51 +02:00
Sebastiaan van Stijn
a14f06a865
Merge pull request #34186 from thaJeztah/api-update-example-data
...
Improve API docs for UsageData
2017-07-20 09:38:28 +02:00
Sebastiaan van Stijn
8299f17278
Merge pull request #34183 from thaJeztah/api-changelog-add-volume-created-at
...
Update API history and example response for volume CreatedAt
2017-07-19 22:13:34 +02:00
Aaron Lehmann
ea1d14a189
api: Update swagger.yaml for configs
...
Also fix bad reference to ServiceSpec.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-07-19 09:52:25 -07:00
Sebastiaan van Stijn
194f635ce7
Improve API docs for UsageData
...
The docs did not mention when this information
was set, and what the `-1` value indicated.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-07-19 16:25:38 +02:00
Sebastiaan van Stijn
48a83a3a18
Update API history and example response for volume CreatedAt
...
This adds the new `CreatedAt` field to the API version history
and updates some examples to show this information.
The `CreatedAt` field was implemented in a46f757c40github@gone.nl >
2017-07-19 16:18:08 +02:00
Sebastiaan van Stijn
eb9e5cd14b
Merge pull request #32453 from cpuguy83/default_enable_pprof
...
Enable pprof/debug endpoints by default
2017-07-19 16:13:12 +02:00
Aaron Lehmann
b642b3f21f
Avoid using a map for log attributes
...
Having a map per log entry seemed heavier than necessary. These
attributes end up being sorted and serialized, so storing them in a map
doesn't add anything (there's no random access element). In SwarmKit,
they originate as a slice, so there's an unnecessary conversion to a map
and back.
This also fixes the sort comparator, which used to inefficiently split
the string on each comparison.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-07-18 19:01:20 -07:00
Sebastiaan van Stijn
f6954bea9f
Fix API docs for GET /secrets/{id}, GET /secrets
...
The swagger.yml defined these endpoints to return
a "ServiceSpec" instead of a "SecretSpec".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-07-19 00:22:05 +02:00
Sebastiaan van Stijn
0304c98d85
Merge pull request #34157 from twistlock/plugable_secrets_backend
...
plugable secret backend
2017-07-18 18:07:27 +02:00
Sebastiaan van Stijn
32ada4dcf1
Merge pull request #34002 from thaJeztah/carry-32483
...
Service privileges: API docs
2017-07-18 13:09:08 +02:00
Liron Levin
e3f920d2f1
pluggable secret backend
...
Fixing secret driver serialization issue from
08f7cf0526liron@twistlock.com >
2017-07-18 12:45:44 +03:00
Brian Goff
408c7ade70
Enable pprof/debug endpoints by default
...
Makes sure that debug endpoints are always available, which will aid in
debugging demon issues.
Wraps debug endpoints in the middleware chain so the can be blocked by
authz.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2017-07-17 15:01:30 -04:00
Liron Levin
7d45cafd57
pluggable secret backend
...
This commit extends SwarmKit secret management with pluggable secret
backends support.
Updating the work in
[swarmkit](docker/swarmkit@eebac27434 ) for
pluggable secret backend and adding the
driver parameter to `SecretSpec`.
Remaining work:
- [ ] CLI support (docker/cli)
- [ ] api in [plugin helpers](docker/go-plugins-helpers))
- [ ] Reference plugin
- [ ] Documenation (after cli work)
Signed-off-by: Liron Levin <liron@twistlock.com >
2017-07-15 16:50:02 +03:00
Sebastiaan van Stijn
d0a8e73e7b
Service privileges: API docs
...
This documents the Service privileges
API changes, that were added in:
091b5e68eagithub@gone.nl >
2017-07-14 17:04:26 -07:00
allencloud
c8d6477e5a
add config event in swagger.yml
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2017-07-12 08:48:14 +08:00
allencloud
ed916a233c
make engine support cluster config event
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2017-07-11 17:21:15 +08:00
Victor Vieux
6978a6e25a
Merge pull request #34035 from allencloud/add-cluster-event-details-in-swagger
...
add cluster events details in swagger.yml
2017-07-11 11:04:27 +02:00
allencloud
f596fb7683
add cluster events details in swagger.yml
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2017-07-11 11:54:22 +08:00
allencloud
87b4dc2002
return prune data when context canceled
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2017-07-10 10:06:24 +08:00
Brian Goff
72c3bcf2a5
Make plugin emit strongly typed, consumable events
...
Enables other subsystems to watch actions for a plugin(s).
This will be used specifically for implementing plugins on swarm where a
swarm controller needs to watch the state of a plugin.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2017-07-06 14:26:06 -04:00
Sebastiaan van Stijn
9d95740dbf
Merge pull request #33941 from thaJeztah/update-api-docs
...
Add missing API documentatoin for DataPathAddr
2017-07-05 18:35:45 -07:00
Vincent Demeester
ff4f700f74
Merge pull request #33322 from jsoref/spelling
...
Spelling
2017-07-04 15:46:34 +02:00
Sebastiaan van Stijn
c79c16910c
Add missing API documentatoin for DataPathAddr
...
COmmit 0307fe1a0bgithub@gone.nl >
2017-07-04 03:11:40 -07:00
Sebastiaan van Stijn
b9f248d0ea
Merge pull request #33884 from aaronlehmann/redact-secret-payload
...
middleware: Redact secret data on "secret create"
2017-07-03 14:18:32 -07:00
Josh Soref
39bcaee47b
Spelling fixes
...
* additional
* ambiguous
* anonymous
* anything
* application
* because
* before
* building
* capabilities
* circumstances
* commit
* committer
* compresses
* concatenated
* config
* container
* container's
* current
* definition
* delimiter
* disassociates
* discovery
* distributed
* doesnotexist
* downloads
* duplicates
* either
* enhancing
* enumerate
* escapable
* exactly
* expect
* expectations
* expected
* explicitly
* false
* filesystem
* following
* forbidden
* git with
* healthcheck
* ignore
* independent
* inheritance
* investigating
* irrelevant
* it
* logging
* looking
* membership
* mimic
* minimum
* modify
* mountpoint
* multiline
* notifier
* outputting
* outside
* overridden
* override
* parsable
* plugins
* precedence
* propagation
* provided
* provides
* registries
* repositories
* returning
* settings
* should
* signals
* someone
* something
* specifically
* successfully
* synchronize
* they've
* thinking
* uninitialized
* unintentionally
* unmarshaling
* unnamed
* unreferenced
* verify
Signed-off-by: Josh Soref <jsoref@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-07-03 13:13:09 -07:00
Josh Soref
6284cf5e9a
gofmt: 5 files
...
gofmt from go1.8.3
hg locate '*.go' |xargs ~/go/bin/gofmt -s -w
Signed-off-by: Josh Soref <jsoref@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-07-03 10:32:47 -07:00
Vincent Demeester
b8766fe793
Merge pull request #33824 from ijc/build-iidfile-with-squash
...
builder: Emit a BuildResult after squashing.
2017-06-30 16:42:23 +02:00
Aaron Lehmann
3fbc352cbb
middleware: Redact secret data on "secret create"
...
With debug logging turned on, we currently log the base64-encoded secret
payload.
Change the middleware code to redact this. Since the field is called
"Data", it requires some context-sensitivity. The URI path is examined
to see which route is being invoked.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-06-29 16:04:47 -07:00
John Howard
950d472c9c
Merge pull request #33826 from Microsoft/jjh/lcownits
...
LCOW: Fix nits from 33241
2017-06-27 22:56:38 -07:00
John Howard
4ec9766a27
LCOW: Fix nits from 33241
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2017-06-27 11:59:49 -07:00
Daniel Nephin
016eea004b
Set a LastUpdated time in image metadata when an image tag is updated.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-06-26 12:16:26 -07:00
Ian Campbell
9777ec3be0
builder: Emit a BuildResult after squashing.
...
This ensures that the final BuildResult is the actual tagged image.
Fixes #33822 .
Signed-off-by: Ian Campbell <ian.campbell@docker.com >
2017-06-26 13:19:25 +01:00
Vincent Demeester
d311a3a681
Merge pull request #33798 from vdemeester/move-some-api-code-away
...
Move some `api` package functions away
2017-06-24 14:30:25 +02:00
