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

26985 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
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
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
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
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
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
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
Brian Goff
15aa5ee667 Merge pull request #28197 from sdurrheimer/zsh-completion-image-subcommand 
Add zsh completion for new 'docker image' subcommands
Upstream-commit: 51254847203ffa1df2f53950278d478b9cc38b0f
Component: engine
 2016-11-09 10:30:55 -05:00
Sebastiaan van Stijn
e788fbec24 Merge pull request #28141 from darrenstahlmsft/TerminateTemplates 
Terminate template containers before delting a layer
Upstream-commit: 70b53c932dbc757c44ae7b18ad122b043fb82530
Component: engine
 2016-11-09 15:44:33 +01:00
Vincent Demeester
9c6b6dc40c Merge pull request #27947 from milindchawre/fix_27798 
Fixes #27798 : Update help for --blkio-weight parameter
Upstream-commit: 4f7083a04f1ad7ce84a30a412ee374c2a92afc95
Component: engine
 2016-11-09 15:35:38 +01:00
Vincent Demeester
0993a3cf62 Merge pull request #28201 from yuexiao-wang/test-func 
Update function name for TestCalculBlockIO
Upstream-commit: 103641f5c6f1afee9c8f3d44d15f21ac950bc015
Component: engine
 2016-11-09 15:34:25 +01:00
Yong Tang
f06ad7a360 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>
Upstream-commit: beafc7c7d97e76135cfa4e17980d274be7a3ff5e
Component: engine
 2016-11-09 06:30:10 -08:00
Brian Goff
72ae55dd14 Merge pull request #28037 from crosbymichael/tini 
Replace grimes with tini for default init shipped in Docker
Upstream-commit: 93e837d1d2d3a24b0219ccadc1fdf170d242c137
Component: engine
 2016-11-09 09:29:42 -05:00
Sebastiaan van Stijn
95ba56ed2a Merge pull request #27733 from milindchawre/fix_update_delay 
Fixes #24083 : Improving cli help for flags with duration option
Upstream-commit: bab1b2a0a40c9e4c2448f90cf034f5cd800cc2f8
Component: engine
 2016-11-09 15:06:05 +01:00
Justin Cormack
d1564f5e36 Merge pull request #27329 from dattatrayakumbhar04/26639_nfs_volume_with_hostname 
#26639: Local NFS volumes do not resolve hostnames
Upstream-commit: 5020905e9d1a365bf6f23c432a09500fd80ca112
Component: engine
 2016-11-09 13:46:56 +00:00
milindchawre
3cf5c6ee9d Fixes #24083 : Improving cli help for flags with duration option 
Signed-off-by: milindchawre <milindchawre@gmail.com>
Upstream-commit: ecb59a2283be35b2dba2951ed1542afe4e896d8a
Component: engine
 2016-11-09 12:17:28 +00:00
Sebastiaan van Stijn
a40c9e3002 Merge pull request #26088 from akirakoyasu/patch-fluent-unixsocket 
Proposal: unix-sockets support in Fluentd logging driver
Upstream-commit: 806f09bf32c49cd0493a97522cd809b09b52dfb6
Component: engine
 2016-11-09 12:49:06 +01:00
yuexiao-wang
a66c2a4dd3 Update function name for TestCalculBlockIO 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 5ffe496a2233a0620099906e1cf2de24d5dfb56d
Component: engine
 2016-11-09 17:43:10 +08:00
Vincent Demeester
fef442cb37 Merge pull request #28098 from yongtang/25099-oom_score_adj-empty-env 
Fix `/proc/<pid>/oom_score_adj: invalid argument` error caused by empty env name
Upstream-commit: c025049c27c2cc8a6f1f978769c89a1fdf07a6f3
Component: engine
 2016-11-09 10:39:18 +01:00
Sebastiaan van Stijn
c6ff6077d0 Merge pull request #28193 from yuexiao-wang/plugin-driver 
Fix the link for plugin documentation
Upstream-commit: 79c37d148330ce3b6188976c67660555f27f078d
Component: engine
 2016-11-09 10:25:06 +01:00
Vincent Demeester
7198214971 Merge pull request #27997 from aaronlehmann/raft-options 
cli: Add options for Raft snapshotting
Upstream-commit: 29a38a4fe8caebbad9ea72ca0d4b4fc80118df3c
Component: engine
 2016-11-09 10:19:45 +01:00
Victor Vieux
7a0c275bc3 Merge pull request #27311 from darrenstahlmsft/CloseStdinError 
Windows: Stop returning errors that should be ignored while closing stdin
Upstream-commit: 2ee6032c8887775d7aca5de8889374cb31a1e017
Component: engine
 2016-11-09 00:17:04 -08:00
Steve Durrheimer
0d2e6f9d94 Cleanup after moving all zsh completion logics for the new image command 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 29367c7e684d1178612b36dcc550c354bf15b68d
Component: engine
 2016-11-09 08:15:25 +01:00