p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,757 Commits 2 Branches 295 Tags
f5437c0d7801cc56790beaf439a177df172d6e07
Commit Graph

28757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tonis Tiigi
f5437c0d78 vendor: update errors to 839d9e91 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 472ecae0d801f71d8b44f4ca7a9fff0b9271799f
Component: engine
 2016-11-09 16:09:00 -08:00
Tonis Tiigi
1e77cc5379 vendor: update swarmkit to bddd3f0 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2a68f0f0016caa6cef8d32726002b9ad02a4c56c
Component: engine
 2016-11-09 16:08:52 -08:00
Victor Vieux
174f2a0d72 Merge pull request #28025 from vdemeester/swarm-mode-templating 
Add support for swarm mode templating
Upstream-commit: 8ffd1a370c447db92a67d17f900ccd453dbcedee
Component: engine
 2016-11-09 15:57:52 -08:00
Jana Radhakrishnan
3e9922773f Merge pull request #28078 from sanimej/inspect 
Show peer nodes in network inspect for swarm overlay networks
Upstream-commit: 5ef5a4216a83421122461c90b7aa1ca1d709c4c8
Component: engine
 2016-11-09 15:33:13 -08:00
Victor Vieux
a16c95482f Merge pull request #28212 from crosbymichael/tini-deps 
Add tini deps for deb and rpm
Upstream-commit: 75091abe76531d4373aba2da680b695e5dbb8fc8
Component: engine
 2016-11-09 15:20:58 -08:00
Tibor Vass
e85707f736 Merge pull request #28002 from Microsoft/jjh/noreexec 
Windows: Allow a no-reexec option for importLayer
Upstream-commit: 5e3d777401cd96bd9958971533222726edb1caa5
Component: engine
 2016-11-09 14:46:21 -08:00
Vincent Demeester
9549c6b9d6 Add support for swarm mode templating 
Wire templating support of swarmkit for the engine, in order to be used
through services.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6212ea669b4e92b3aa3985857f827ee9b95271fd
Component: engine
 2016-11-09 23:28:06 +01:00
Santhosh Manohar
6c7506b25f Show peer nodes in network inspect for swarm overlay networks 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: dd9944aa644c717009a85ab85e00894ef3d3b20f
Component: engine
 2016-11-09 13:58:04 -08:00
Sebastiaan van Stijn
44e382058d Merge pull request #28214 from albers/completion-for-28196 
Add bash completion for `docker {node rm,swarm leave} -f`
Upstream-commit: 9482da362c63e45d4f0ae4d43bb7ef0c4a7b2fd8
Component: engine
 2016-11-09 22:56:22 +01:00
Brian Goff
19713269e4 Merge pull request #28215 from dnephin/validate-swagger-gen 
Add validate/swagger-gen
Upstream-commit: 9e2d4f91d49a409acb07b06b0d0fe6fb205f608e
Component: engine
 2016-11-09 16:39:22 -05:00
Victor Vieux
9c868a7b94 Merge pull request #27433 from AkihiroSuda/fix-ovl-xfs-ftype0 
overlay: warn if overlay backing fs doesn't support d_type
Upstream-commit: 643ac2f804a5242062113ace64bf68506027c9a6
Component: engine
 2016-11-09 13:39:07 -08:00
Vincent Demeester
6f6d63afeb Update swarmkit to 00890359d8bfba630824b66b848dbf7851149fef 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6e885540a208fe555e3b746d136c84f76e988f8a
Component: engine
 2016-11-09 22:38:24 +01:00
Sebastiaan van Stijn
8c7175ef3e Merge pull request #27794 from ehazlett/secrets 
Secret Management
Upstream-commit: 5e143b5f8d82537635a57f3d9eda8126caf68a6f
Component: engine
 2016-11-09 22:26:53 +01:00
Daniel Nephin
1a735f0856 Add validate/swagger-gen 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: be807639b0bf0d8589f4566896b3eb4114724b37
Component: engine
 2016-11-09 14:44:16 -05:00
Harald Albers
df5a4e64bf Add bash completion for docker {node rm,swarm leave} -f 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cc0c14aab72ce3377d9cfa02cfc05f262d99ecd7
Component: engine
 2016-11-09 11:42:18 -08:00
Michael Crosby
5b17cce44b Reorder rpm deps for changelog 
The changelog is auto generated and the comment in the generate.sh
script is a lie, these should not be in alphabetical order but
in chronological order.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 053738f7e267494eee2e5aeb28889ddc3d97b3fa
Component: engine
 2016-11-09 11:33:35 -08:00
Victor Vieux
dc6854b4b3 Merge pull request #28184 from Microsoft/jjh/user 
Windows: Plumb through user
Upstream-commit: f67d4b897adc9048269d1b91435b6dcbf69e36d1
Component: engine
 2016-11-09 11:32:42 -08:00
Phil Estes
6941a29c56 Correct secrets permissions when userns enabled 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 8119809b68bee9a027bae9d5851b11c743438bd6
Component: engine
 2016-11-09 14:27:46 -05:00
Evan Hazlett
bd2a95acd1 fix lint issue from rebase 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 83af60e6237b4227126dad1ef2f8a2016984ee90
Component: engine
 2016-11-09 14:27:46 -05:00
Evan Hazlett
807eb50cc6 use human readable units when listing secrets 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 880e8be1eea086ee83e5ad22f953696365c5b799
Component: engine
 2016-11-09 14:27:46 -05:00
Evan Hazlett
f16e4b6295 add api docs for secrets 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 0bcb65ccbae17bf9370191bb295548d232569b93
Component: engine
 2016-11-09 14:27:45 -05:00
Evan Hazlett
bd20a72add more review updates 
- return err instead of wrap for update secret
- add omitempty for data in secret spec

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 427c70d97779566b2b3ea3a9141bb9bf3dd05dd8
Component: engine
 2016-11-09 14:27:45 -05:00
Evan Hazlett
d5d838f9f3 embed spec when converting from grpc 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: a9d41184296c971c650f7d97a67ae5c9b44d4200
Component: engine
 2016-11-09 14:27:45 -05:00
Evan Hazlett
5cd25dda5d SecretRequestOptions -> SecretRequestOption 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 5b2230a38b357a3e2725fc56be9c07c01fd1203e
Component: engine
 2016-11-09 14:27:45 -05:00
Evan Hazlett
da9150e0d2 review updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: e9fd1c5918c1fc49c9c3a024d0ef52b57f73e9f0
Component: engine
 2016-11-09 14:27:45 -05:00
Evan Hazlett
5907fa959f more review updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: eff36b7d669a8d0dbb9d79b70f9cb1f8a6ffdbd8
Component: engine
 2016-11-09 14:27:45 -05:00
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
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
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
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
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
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
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
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
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