Commit Graph
36884 Commits
Author SHA1 Message Date
Evan Hazlett f6d1323726 add integration tests for secret create with labels
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: e077f701dbd0cda8eaf4c96628e145c2cf450995
Component: engine
2016-11-09 14:27:45 -05:00
Evan Hazlett 19e0a8c065 support labels for secrets upon creation; review updates
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 583c013a8735031f4e5090bb1699effb64daf950
Component: engine
2016-11-09 14:27:45 -05:00
Evan Hazlett 8c1af1ea76 remove SecretRequestSpec
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 4d1fba0204af2b8cd5ae119a286eaefc84533945
Component: engine
2016-11-09 14:27:45 -05:00
Evan Hazlett d31e5eafbe secrets: support simple syntax --secret foo
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: a257f674ba22d325e7ad59541723c3ee4e9adc27
Component: engine
2016-11-09 14:27:45 -05:00
Evan Hazlett e093728442 review updates
- use Filters instead of Filter for secret list
- UID, GID -> string
- getSecrets -> getSecretsByName
- updated test case for secrets with better source
- use golang.org/x/context instead of context
- for grpc conversion allocate with make
- check for nil with task.Spec.GetContainer()

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: b2e4c7f3b5b30fc6940768ec41836d708a48b463
Component: engine
2016-11-09 14:27:45 -05:00
Evan Hazlett 3e01794690 move secretopt to opts pkg
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: c00138748daeef52d353dda66c7b89322b7708fc
Component: engine
2016-11-09 14:27:45 -05:00
Evan Hazlett c28de44f7a secrets: enable secret inspect and rm by secret name
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: e0e65b9a3baab6bb3f35eddb6ed3d52654184029
Component: engine
2016-11-09 14:27:45 -05:00
Evan Hazlett dfef330ccc secrets: use explicit format when using secrets
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 15b97a39d7
Component: cli
2016-11-09 14:27:44 -05:00
Evan Hazlett 9c2b1fd34a secrets: use explicit format when using secrets
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 2adbdcdf5a83b45b4e191413d3aa14158535085b
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett 852ef98676 update to support new target in swarmkit
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 2b0fa52c09
Component: cli
2016-11-09 14:27:44 -05:00
Evan Hazlett 6984dffbb5 update tests for service create and update
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: ca6b6535519881357c9e3bba5fe0d8965ce8077c
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett 2983ce883c simplify secret lookup on service create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 6bbc35a743
Component: cli
2016-11-09 14:27:44 -05:00
Evan Hazlett e9ea5a5560 update to support new target in swarmkit
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 88dea0e06e0e94a8ab4cb5fe852e26bff309261a
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett 9c66350efe support the same secret with different targets on service create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: ab5f829742
Component: cli
2016-11-09 14:27:44 -05:00
Evan Hazlett da6add7ce9 secrets: add service create and update integration tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 76b33fdb99a6395670b8b466a5ef65a8b928be94
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett 41cabcef6d add secret support for service update
- add nosuid and noexec to tmpfs

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 8554b64b99
Component: cli
2016-11-09 14:27:44 -05:00
Evan Hazlett ade83acd05 lint fixes
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: baffa793db51e72ef853336fb7c3a11a233ce039
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett 5a7b3b358b doc review updates
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: cf6483a1529a7de8939ac5fb85ff94e5f2f4ff60
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett 3d26adc9bc secrets: only try to unmount if present
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 643ae8b400492d47a42524124b5d41da3c37e081
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett bc88c956b6 secrets: only setup secret mount if secrets are requested
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 6d12de53699d6fa03c70493eec63ac5cfa41f2fe
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett 854a5e1eb7 secrets: add secret create and delete integration tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: e63dc5cde4c0dd52c3a54bb007259a4b8878b7df
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett f3ba87649b simplify secret lookup on service create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: dce2afbd81945056aa955079fac04e28ab96e703
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett a0ec36114c docs: update cli reference for secret usage
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

docs: minor update to service create usage

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 958881d209a543565e139354a721d45b33863611
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett 994d3dafef support the same secret with different targets on service create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 111e497dc6be6a1211e446d6a91bfb6e1c14e4c2
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett a28c910916 add secret support for service update
- add nosuid and noexec to tmpfs

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 00237a96249739dbf426d81672a904e9f4c5e702
Component: engine
2016-11-09 14:27:44 -05:00
Evan Hazlett 719ce57b9e more review updates
- use /secrets for swarm secret create route
- do not specify omitempty for secret and secret reference
- simplify lookup for secret ids
- do not use pointer for secret grpc conversion

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 548728bb84
Component: cli
2016-11-09 14:27:43 -05:00
Evan Hazlett 89698b2350 more review updates
- use /secrets for swarm secret create route
- do not specify omitempty for secret and secret reference
- simplify lookup for secret ids
- do not use pointer for secret grpc conversion

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 4e8f1a7dd9
Component: cli
2016-11-09 14:27:43 -05:00
Evan Hazlett f9430dc4f0 add SecretMount and UnmountSecrets methods for non-Linux
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 72c1d7f46bbc5e525f9339f6a1015c6a38b2616e
Component: engine
2016-11-09 14:27:43 -05:00
Evan Hazlett d1a4dc8e90 secrets: secret management for swarm
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: use tmpfs for swarm secrets

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: inject secrets from swarm secret store

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: use secret names in cli for service create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

switch to use mounts instead of volumes

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vendor: use ehazlett swarmkit

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: finish secret update

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 72ff77999c
Component: cli
2016-11-09 14:27:43 -05:00
Evan Hazlett 7158215706 review changes
- fix lint issues
- use errors pkg for wrapping errors
- cleanup on error when setting up secrets mount
- fix erroneous import
- remove unneeded switch for secret reference mode
- return single mount for secrets instead of slice

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 3f9494f1d6
Component: cli
2016-11-09 14:27:43 -05:00
Evan Hazlett e2eea356c2 proper cleanup upon mount fail
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 0c170a76c51be67bd6f7c4d38ed28ddcb473eac9
Component: engine
2016-11-09 14:27:43 -05:00
Evan Hazlett a0307eb205 secrets: secret management for swarm
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: use tmpfs for swarm secrets

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: inject secrets from swarm secret store

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: use secret names in cli for service create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

switch to use mounts instead of volumes

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vendor: use ehazlett swarmkit

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: finish secret update

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 1be644fbcf
Component: cli
2016-11-09 14:27:43 -05:00
Evan Hazlett 45bc21e90e update to support latest swarm changes
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: f50a65ff0c28618f798d06838e36b015dd022b45
Component: engine
2016-11-09 14:27:43 -05:00
Evan Hazlett 848c015ac1 more review updates
- use /secrets for swarm secret create route
- do not specify omitempty for secret and secret reference
- simplify lookup for secret ids
- do not use pointer for secret grpc conversion

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 189f89301e0abfee32447f2ca23dacd3a96de06d
Component: engine
2016-11-09 14:27:43 -05:00
Evan Hazlett b7893465b0 more review changes
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 669a9dbe7f260f2d9e18d80e8f604012122054f7
Component: engine
2016-11-09 14:27:43 -05:00
Evan Hazlett dde21cf7dc review changes
- fix lint issues
- use errors pkg for wrapping errors
- cleanup on error when setting up secrets mount
- fix erroneous import
- remove unneeded switch for secret reference mode
- return single mount for secrets instead of slice

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 857e60c2f943a09e3ec0ac0f236821b797935900
Component: engine
2016-11-09 14:27:43 -05:00
Evan Hazlett 9dbbc071d5 secrets: secret management for swarm
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: use tmpfs for swarm secrets

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: inject secrets from swarm secret store

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: use secret names in cli for service create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

switch to use mounts instead of volumes

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vendor: use ehazlett swarmkit

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: finish secret update

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 3716ec25b423d8ff7dfa231a7b3cf0154726ed37
Component: engine
2016-11-09 14:27:43 -05:00
Evan Hazlett 5431f2d3ce secrets: vendor swarmkit
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: vendor swarmkit

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 1310dadf4ab3f38b346d78a6cbc7dae045388013
Component: engine
2016-11-09 14:27:43 -05:00
Michael Crosby f1be94b613 Add tini build deps to deb generation
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6440c5d822c6c9083155839d1d6f51b369a9ebee
Component: engine
2016-11-09 11:12:14 -08:00
Michael Crosby 102c65140b Merge pull request #28047 from cpuguy83/27773_chrootarchive_rbind
Fix issue with cp to container volume dir
Upstream-commit: da0ccf8e61e4d5d4005e19fcf0115372f09840bf
Component: engine
2016-11-09 10:52:14 -08:00
Michael Crosby caf784f5ba Add tini deps to rpm build
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: e0e7dd6fee00b97ae7d73a21528c4f84bfae88ba
Component: engine
2016-11-09 10:47:24 -08:00
Vincent Demeester 6b90362056 Merge pull request #28196 from allencloud/add-short-flag-for-force
add short flag for force
Upstream-commit: fe77fc5bf11157391c937748b68fffe1c758c60a
Component: engine
2016-11-09 18:11:58 +01:00
Vincent Demeester a3f4ca2ca6 Merge pull request #28196 from allencloud/add-short-flag-for-force
add short flag for force
Upstream-commit: a11f7b1577
Component: cli
2016-11-09 18:11:58 +01:00
Sebastiaan van Stijn 4a16b71589 Merge pull request #28163 from yongtang/11082016-help-ptr
Remove `-ptr` from the help output of `service create`
Upstream-commit: 01f5c52a591d4d27b45db81f2899c18f68c76a66
Component: engine
2016-11-09 17:53:06 +01:00
Sebastiaan van Stijn 7ca2ab3891 Merge pull request #28163 from yongtang/11082016-help-ptr
Remove `-ptr` from the help output of `service create`
Upstream-commit: 45f8ef1668
Component: cli
2016-11-09 17:53:06 +01:00
Sebastiaan van Stijn 9e91339111 Merge pull request #28208 from thaJeztah/carry-27830-deprecate-no-version-in-api-urls
[carry 27830] Deprecate API calls without a version
Upstream-commit: ce142ec7a3c429c4d71103c8932e8565baea867c
Component: engine
2016-11-09 17:45:44 +01:00
Brian Goff 07ffcc9abc Merge pull request #28189 from Microsoft/jjh/fluentd
Windows: Enable fluentd logdriver
Upstream-commit: bf960a6bdc3fae8c69b8ecf6bbc2562548f55929
Component: engine
2016-11-09 11:28:37 -05:00
Ben Firshman d8b013433e Deprecate API calls without a version
See #21157 for more details.

In a future version of Docker, providing a version to API calls
will be mandatory. An implementation of this is in #27801.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: a5fe15072dc32b7a613c7776936014e4b1857ee1
Component: engine
2016-11-09 17:04:16 +01:00
Kenfe-Mickael Laventure f1194715ab Add expected 3rd party binaries commit ids to info
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 801167fcec
Component: cli
2016-11-09 07:42:44 -08:00
Kenfe-Mickael Laventure 515ebb7b5c Add expected 3rd party binaries commit ids to info
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 2790ac68b32b399c872de88388bdccc359ed7a88
Component: engine
2016-11-09 07:42:44 -08:00