ed052d78fd
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 >
Upstream-commit: 7d45cafd5746e847e58078aa2fbdde57b5f49fa4
Component: engine
2017-07-15 16:50:02 +03:00
3a04c6bfdb
add config event in swagger.yml
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: c8d6477e5a359d30cdf0a59cdbfffc158a1d9388
Component: engine
2017-07-12 08:48:14 +08:00
94a5aefc94
make engine support cluster config event
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ed916a233c577693afc8dc3122311c15246d00cc
Component: engine
2017-07-11 17:21:15 +08:00
fef91e1185
Merge pull request #34035 from allencloud/add-cluster-event-details-in-swagger
...
add cluster events details in swagger.yml
Upstream-commit: 6978a6e25a2e6063f280ec842bd0f3eae99426e1
Component: engine
2017-07-11 11:04:27 +02:00
cfd6048882
add cluster events details in swagger.yml
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: f596fb7683227021b74d299ad1613a1e3263cf30
Component: engine
2017-07-11 11:54:22 +08:00
f4101eb2fb
return prune data when context canceled
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 87b4dc2002d50e245f432bbd97e9dee2db25cf96
Component: engine
2017-07-10 10:06:24 +08:00
c782cb6c44
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 >
Upstream-commit: 72c3bcf2a533a827402945e3a55872e2db4fb024
Component: engine
2017-07-06 14:26:06 -04:00
9691a9deb1
Merge pull request #33941 from thaJeztah/update-api-docs
...
Add missing API documentatoin for DataPathAddr
Upstream-commit: 9d95740dbfb790b3ea531a363697076ffb97a294
Component: engine
2017-07-05 18:35:45 -07:00
ec1ee882b3
Merge pull request #33322 from jsoref/spelling
...
Spelling
Upstream-commit: ff4f700f74450018f36d014f3cde0ff1b9c17fb3
Component: engine
2017-07-04 15:46:34 +02:00
e720e150d4
Add missing API documentatoin for DataPathAddr
...
COmmit 0307fe1a0bcdc02583a24add41eb783c117bad8c added
a new `DataPathAddr` property to the swarm/init and swarm/join
endpoints. This property was not yet added to the
documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c79c16910c0f3d6e88f2dc6ef609ecc3b02ccef9
Component: engine
2017-07-04 03:11:40 -07:00
3fea46b7b2
Merge pull request #33884 from aaronlehmann/redact-secret-payload
...
middleware: Redact secret data on "secret create"
Upstream-commit: b9f248d0ea9f7ec4e0325c7034038319c70c2dda
Component: engine
2017-07-03 14:18:32 -07:00
643654c2f0
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 >
Upstream-commit: 39bcaee47b8a284a46b761afe218ba7deda0d482
Component: engine
2017-07-03 13:13:09 -07:00
c2eb21415c
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 >
Upstream-commit: 6284cf5e9a4bc121b73422c454cdbf8dc18f42f3
Component: engine
2017-07-03 10:32:47 -07:00
ab5c937cf4
Merge pull request #33824 from ijc/build-iidfile-with-squash
...
builder: Emit a BuildResult after squashing.
Upstream-commit: b8766fe793c18149e167b8f9819352a3bfcb0514
Component: engine
2017-06-30 16:42:23 +02:00
c71c867f51
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 >
Upstream-commit: 3fbc352cbbce06cd3001d6b14b2b1ebcb4d42cd5
Component: engine
2017-06-29 16:04:47 -07:00
08b4e324e5
Merge pull request #33826 from Microsoft/jjh/lcownits
...
LCOW: Fix nits from 33241
Upstream-commit: 950d472c9ce4180b80e28030f7de68ffc3254f97
Component: engine
2017-06-27 22:56:38 -07:00
9a5747b3f9
LCOW: Fix nits from 33241
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4ec9766a27ffb964cec6b8b2745725965b2644aa
Component: engine
2017-06-27 11:59:49 -07:00
f5f8240661
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 >
Upstream-commit: 016eea004ba0109d7cd965eab242ed17e4f0f36c
Component: engine
2017-06-26 12:16:26 -07:00
1c2b78478c
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 >
Upstream-commit: 9777ec3be0e3056d0bedcf36052704f832e45759
Component: engine
2017-06-26 13:19:25 +01:00
aaa2288536
Merge pull request #33798 from vdemeester/move-some-api-code-away
...
Move some `api` package functions away
Upstream-commit: d311a3a681f918906249a1678eab0136ac663f6e
Component: engine
2017-06-24 14:30:25 +02:00
cbfdedc6bd
Move some api package functions away
...
- DisplayablePorts is a `cli` function, moving to `docker/cli`
- Move MatchesContentType to the only package using it,
`api/server/httputils` (and remove the deps on logrus for `api` package)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 565aa41392b01251dfc9398eb69c23bdd8ea64e6
Component: engine
2017-06-23 19:37:26 +02:00
3821f2cd57
Documentation updates for interactive sessions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b8b8a9c837889c8851aade242ab1a1be0a8e7cf4
Component: engine
2017-06-22 15:36:56 -07:00
e529bcd027
Implement incremental file sync using client session
...
Also exposes shared cache and garbage collection/prune
for the source data.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 5c3d2d552b0430672d5f481ab2d37036f6e92166
Component: engine
2017-06-22 11:52:35 -07:00
6553b6419b
session: update swagger yaml
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4f51ca1e825072d89762a1a5273e714196910d90
Component: engine
2017-06-22 11:22:42 -07:00
b1e4d7d884
Add long-running client session endpoint
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ec7b6238c31e26702ecf366731532e189b5da142
Component: engine
2017-06-22 11:22:41 -07:00
ad62bca460
Merge pull request #33241 from Microsoft/jjh/multi-layerstore
...
LCOW: Support most operations excluding remote filesystem
Upstream-commit: 930e6896685f614d8f15ed10207596b1a151cbc8
Component: engine
2017-06-21 15:45:23 -07:00
01b491fce5
LCOW: Create layer folders with correct ACL
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ed10ac6ee93cf5c389a735c0c97b08d5d5dff3a9
Component: engine
2017-06-20 19:50:12 -07:00
9541d17c29
LCOW: Plumb through platform on Import
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3d5cec70b4432866e4c290e9fc601571ca09da9d
Component: engine
2017-06-20 19:49:54 -07:00
2665467b29
LCOW: Builder plumbing
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 08252bc963a20b2fb3052fc8db7143771c8c3248
Component: engine
2017-06-20 19:49:53 -07:00
094f300460
LCOW: pull goes to correct stores
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a1fe1dc791633998bcc82b5f0734a5da68d2bb41
Component: engine
2017-06-20 19:49:52 -07:00
3af9801344
LCOW: Move daemon stores to per platform
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3aa4a0071536d3b106374eaa44d8a55765901aa6
Component: engine
2017-06-20 19:49:52 -07:00
d3db128900
builder: fix copy —from conflict with force pull
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c268d9da4b658b2dd1fe48010a8929b603913e92
Component: engine
2017-06-20 15:45:33 -07:00
8c7c972d20
Merge pull request #33454 from dnephin/refactor-builder-remove-copy-on-build
...
[Builder] Move file coping from the daemon to the builder
Upstream-commit: 99c72eb2682c0539ad3cc544eb28876af78b33a1
Component: engine
2017-06-20 10:12:57 +02:00
c832750e54
Remove Go 1.6 code from moby
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 6bfd0f6b5d08bcd609da11947432ad0f3aa3d8fd
Component: engine
2017-06-19 15:59:00 +03:00
b687d7ca5a
Merge pull request #33630 from yongtang/167-cli-network-inspect-scope
...
Add `scope` filter in `GET /networks/(id or name)`
Upstream-commit: 4310f7da7e6bcd8185bf05e032f9b7321cfa6ea2
Component: engine
2017-06-12 18:27:24 -07:00
2ef8445394
Merge pull request #33005 from alfred-landrum/denied-error
...
Suggest login on pull denial
Upstream-commit: f4bf61c79da153c039e2df586737cd8d54d26a55
Component: engine
2017-06-13 01:51:18 +02:00
99aad7f08b
Add scope filter in /networks/<id>
...
This fix tries to add a `scope` in the query of `/networks/<id>`
(`NetworkInspect`) so that in case of duplicate network names,
it is possible to locate the network ID based on the network
scope (`local`, 'swarm', or `global`).
Multiple networks might exist in different scopes, which is a legitimate case.
For example, a network name `foo` might exists locally and in swarm network.
However, before this PR it was not possible to query a network name `foo`
in a specific scope like swarm.
This fix fixes the issue by allowing a `scope` query in `/networks/<id>`.
Additional test cases have been added to unit tests and integration tests.
This fix is related to docker/cli#167 , moby/moby#30897 , moby/moby#33561 , moby/moby#30242
This fix fixes docker/cli#167
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 158b2a1875cf33f3560dedaeb0149e1fbe54c1ef
Component: engine
2017-06-12 09:54:25 -07:00
33135ac6fd
Merge pull request #33612 from thaJeztah/bump-api-version
...
Bump API version
Upstream-commit: 3f6b6c2981aa231823c51ed84ee0f89d81105c5b
Component: engine
2017-06-10 02:00:45 +02:00
83a1ff66bd
Suggest login on pull denial
...
Signed-off-by: Alfred Landrum <alfred.landrum@docker.com >
Upstream-commit: 8d9f51ea55c8c9373d20bcc7561ca34c59aaf8c2
Component: engine
2017-06-09 12:43:21 -07:00
c9920c89e8
Merge pull request #33609 from thaJeztah/backport-29418
...
backport #29418 "Fix buildIpamResources()" to master
Upstream-commit: c9f26eaaf8b9f7977319d6d596f8701bbc58a108
Component: engine
2017-06-09 19:18:50 +02:00
aed3533620
Bump API version
...
With the Moby/Docker split, no decisions have been
made yet how, and when to bump the API version.
Although these decisions should not be lead
by Docker releases, I'm bumping the API version
to not complicate things for now; after this bump
we should make a plan how to handle this in future
(for example, using SemVer for the REST api, and
bump with every change).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7839ff2244a7fcbac0882b1426bbd2c5477c1abe
Component: engine
2017-06-09 14:58:01 +02:00
ae3f3a569b
Merge pull request #32122 from allencloud/choose-rpc-code-to-determine-status-code
...
choose rpc code to determine status code
Upstream-commit: 27ca921db1d2b4f19fa60a5d7994fec29fb2d025
Component: engine
2017-06-09 14:32:24 +02:00
758ca586cf
Merge pull request #29418 from aboch/p66
...
[1.13.x] Fix buildIpamResources()
(cherry picked from commit 4d2be03b68dd54d8f2307e8b4178ad8ed8d5d343)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 27498a3c60018ea2880a18beec65710fd27971a7
Component: engine
2017-06-09 13:51:43 +02:00
13d2adae3f
Fix copy when used with scratch and images with empty RootFS
...
Commit the rwLayer to get the correct DiffID
Refacator copy in thebuilder
move more code into exportImage
cleanup some windows tests
Release the newly commited layer.
Set the imageID on the buildStage after exporting a new image.
Move archiver to BuildManager.
Have ReleaseableLayer.Commit return a layer
and store the Image from exportImage in the local imageSources cache
Remove NewChild from image interface.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 51360965206b0db49cc0365dabb590063a17a9df
Component: engine
2017-06-08 15:07:16 -04:00
cc0cc953be
Describe the differences between container-inspect and container-list
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: e8a1d99afb42d0931f7e1fd3df41611aafddf5a9
Component: engine
2017-06-06 21:33:08 +03:00
9244630a6b
choose rpc code to determine status code
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: f257f77c6c13ee851d3b899f8d51628a5dec92db
Component: engine
2017-06-06 10:08:50 +08:00
dbc4b6c5bd
Do not log the CA config CA signing key in debug mode.
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: d60f18204978d438d1eb336512576d47991c8ac1
Component: engine
2017-05-31 18:15:33 -07:00
bad34014ad
Merge pull request #33423 from gesellix/swagger-docs-typo
...
Fix typo in swagger doc
Upstream-commit: d192db0d9350222d2b8bb6eba8525b04c3be7d61
Component: engine
2017-05-29 15:58:50 +02:00
7acd97d8f9
Merge pull request #33257 from mtesselH/master
...
Add CreatedAt filed to volume. Display when volume is inspected.
Upstream-commit: 79b19c2e16c43f22187538953f49b2c048b063f8
Component: engine
2017-05-29 10:48:07 +01:00
1a6d5b7b4c
Fix typo in swagger doc
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 56da4f2fb2509f9b2c2bc1c1c609c1dabeaec07d
Component: engine
2017-05-27 22:37:36 +02:00
