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

28730 commits

This branch
This branch
All branches
Author SHA1 Message Date
Evan Hazlett
427c70d977 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>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
a9d4118429 embed spec when converting from grpc 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
5b2230a38b SecretRequestOptions -> SecretRequestOption 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
e9fd1c5918 review updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
eff36b7d66 more review updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
e077f701db add integration tests for secret create with labels 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
583c013a87 support labels for secrets upon creation; review updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
4d1fba0204 remove SecretRequestSpec 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
a257f674ba secrets: support simple syntax --secret foo 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
b2e4c7f3b5 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>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
c00138748d move secretopt to opts pkg 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
e0e65b9a3b secrets: enable secret inspect and rm by secret name 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
2adbdcdf5a secrets: use explicit format when using secrets 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
ca6b653551 update tests for service create and update 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
88dea0e06e update to support new target in swarmkit 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
76b33fdb99 secrets: add service create and update integration tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
baffa793db lint fixes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
cf6483a152 doc review updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
643ae8b400 secrets: only try to unmount if present 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
6d12de5369 secrets: only setup secret mount if secrets are requested 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
e63dc5cde4 secrets: add secret create and delete integration tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
dce2afbd81 simplify secret lookup on service create 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
958881d209 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>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
111e497dc6 support the same secret with different targets on service create 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
00237a9624 add secret support for service update 
- add nosuid and noexec to tmpfs

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
72c1d7f46b add SecretMount and UnmountSecrets methods for non-Linux 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:43 -05:00
Evan Hazlett
0c170a76c5 proper cleanup upon mount fail 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:43 -05:00
Evan Hazlett
f50a65ff0c update to support latest swarm changes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:43 -05:00
Evan Hazlett
189f89301e 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>
 2016-11-09 14:27:43 -05:00
Evan Hazlett
669a9dbe7f more review changes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:43 -05:00
Evan Hazlett
857e60c2f9 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>
 2016-11-09 14:27:43 -05:00
Evan Hazlett
3716ec25b4 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>
 2016-11-09 14:27:43 -05:00
Evan Hazlett
1310dadf4a secrets: vendor swarmkit 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: vendor swarmkit

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:43 -05:00
Michael Crosby
da0ccf8e61 Merge pull request #28047 from cpuguy83/27773_chrootarchive_rbind 
Fix issue with cp to container volume dir
 2016-11-09 10:52:14 -08:00
Vincent Demeester
fe77fc5bf1 Merge pull request #28196 from allencloud/add-short-flag-for-force 
add short flag for force
 2016-11-09 18:11:58 +01:00
Sebastiaan van Stijn
01f5c52a59 Merge pull request #28163 from yongtang/11082016-help-ptr 
Remove `-ptr` from the help output of `service create`
 2016-11-09 17:53:06 +01:00
Sebastiaan van Stijn
ce142ec7a3 Merge pull request #28208 from thaJeztah/carry-27830-deprecate-no-version-in-api-urls 
[carry 27830] Deprecate API calls without a version
 2016-11-09 17:45:44 +01:00
Brian Goff
bf960a6bdc Merge pull request #28189 from Microsoft/jjh/fluentd 
Windows: Enable fluentd logdriver
 2016-11-09 11:28:37 -05:00
Ben Firshman
a5fe15072d 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>
 2016-11-09 17:04:16 +01:00
Brian Goff
5125484720 Merge pull request #28197 from sdurrheimer/zsh-completion-image-subcommand 
Add zsh completion for new 'docker image' subcommands
 2016-11-09 10:30:55 -05:00
Sebastiaan van Stijn
70b53c932d Merge pull request #28141 from darrenstahlmsft/TerminateTemplates 
Terminate template containers before delting a layer
 2016-11-09 15:44:33 +01:00
Vincent Demeester
4f7083a04f Merge pull request #27947 from milindchawre/fix_27798 
Fixes #27798 : Update help for --blkio-weight parameter
 2016-11-09 15:35:38 +01:00
Vincent Demeester
103641f5c6 Merge pull request #28201 from yuexiao-wang/test-func 
Update function name for TestCalculBlockIO
 2016-11-09 15:34:25 +01:00
Yong Tang
beafc7c7d9 Remove -ptr from the help output of service create 
This fix is based on the comment:
https://github.com/docker/docker/pull/28147#discussion_r86996347

Previously the output string of the `DurationOpt` is `duration-ptr`
and `Uint64Opt` is `uint64-ptr`. While it is clear to developers,
for a normal user `-ptr` might not be very informative.

On the other hand, the default value of `DurationOpt` and `Uint64Opt`
has already been quite informative: `none`. That means if no flag
provided, the value will be treated as none.
(like a ptr with nil as the default)

For that reason this fix removes the `-ptr`.

Also, the output in the docs of `service create` has been quite
out-of-sync with the true output. So this fix updates the docs
to have the most up-to-date help output of `service create --help`.

This fix is related to #28147.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-09 06:30:10 -08:00
Brian Goff
93e837d1d2 Merge pull request #28037 from crosbymichael/tini 
Replace grimes with tini for default init shipped in Docker
 2016-11-09 09:29:42 -05:00
Sebastiaan van Stijn
bab1b2a0a4 Merge pull request #27733 from milindchawre/fix_update_delay 
Fixes #24083 : Improving cli help for flags with duration option
 2016-11-09 15:06:05 +01:00
Justin Cormack
5020905e9d Merge pull request #27329 from dattatrayakumbhar04/26639_nfs_volume_with_hostname 
#26639: Local NFS volumes do not resolve hostnames
 2016-11-09 13:46:56 +00:00
milindchawre
ecb59a2283 Fixes #24083 : Improving cli help for flags with duration option 
Signed-off-by: milindchawre <milindchawre@gmail.com>
 2016-11-09 12:17:28 +00:00
Sebastiaan van Stijn
806f09bf32 Merge pull request #26088 from akirakoyasu/patch-fluent-unixsocket 
Proposal: unix-sockets support in Fluentd logging driver
 2016-11-09 12:49:06 +01:00
yuexiao-wang
5ffe496a22 Update function name for TestCalculBlockIO 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-09 17:43:10 +08:00