Граф коммитов

28962 Коммитов

Автор SHA1 Сообщение Дата
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 6440c5d822 Add tini build deps to deb generation
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-11-09 11:12:14 -08: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
Michael Crosby e0e7dd6fee Add tini deps to rpm build
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-11-09 10:47:24 -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
Kenfe-Mickael Laventure 2790ac68b3 Add expected 3rd party binaries commit ids to info
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-09 07:42:44 -08: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
Vincent Demeester c025049c27 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
2016-11-09 10:39:18 +01:00
Sebastiaan van Stijn 79c37d1483 Merge pull request #28193 from yuexiao-wang/plugin-driver
Fix the link for plugin documentation
2016-11-09 10:25:06 +01:00
Vincent Demeester 29a38a4fe8 Merge pull request #27997 from aaronlehmann/raft-options
cli: Add options for Raft snapshotting
2016-11-09 10:19:45 +01:00
Victor Vieux 2ee6032c88 Merge pull request #27311 from darrenstahlmsft/CloseStdinError
Windows: Stop returning errors that should be ignored while closing stdin
2016-11-09 00:17:04 -08:00
Akihiro Suda 2e20e63da2 overlay: warn if overlay backing fs doesn't support d_type
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-11-09 07:18:27 +00:00
Steve Durrheimer 29367c7e68
Cleanup after moving all zsh completion logics for the new image command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:25 +01:00
Steve Durrheimer cc879af088
Move zsh completion logic to new subcommand: tag
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:23 +01:00
Steve Durrheimer d2af96342d
Move zsh completion logic to new subcommand: save
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:22 +01:00
Steve Durrheimer e5c98f3887
Move zsh completion logic to new subcommand: rm
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:20 +01:00
Steve Durrheimer 17cdc95a19
Move zsh completion logic to new subcommand: push
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:18 +01:00
Steve Durrheimer 102742a3cd
Move zsh completion logic to new subcommand: pull
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:16 +01:00
Steve Durrheimer c333821334
Move zsh completion logic to new subcommand: ls
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:14 +01:00
Steve Durrheimer c308befdc0
Move zsh completion logic to new subcommand: load
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:13 +01:00
Steve Durrheimer d0014299b4
Add zsh completion logic to new subcommand: inspect
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:11 +01:00
Steve Durrheimer a4656e46f7
Move zsh completion logic to new subcommand: import
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:10 +01:00
Steve Durrheimer 2014e78730
Move zsh completion logic to new subcommand: history
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:08 +01:00
Steve Durrheimer d3305a17e1
Move zsh completion logic to new subcommand: build
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:07 +01:00
Steve Durrheimer 53a56990c4
Add zsh completion for 'docker image' subcommands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:05 +01:00
Steve Durrheimer 2a44da9732
Rename zsh images & log complete functions
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:14:40 +01:00
allencloud 955c35b6a6 add short flag for force
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-09 14:40:47 +08:00
yuexiao-wang 701021ebd8 Fix the link for plugin documentation
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-09 13:50:14 +08:00
John Howard cff9679c6c Windows: Enable fluentd logdriver
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-08 19:54:57 -08:00
John Howard 64a42d656b Merge pull request #28185 from Microsoft/jjh/concurrentaccess
Windows: Avoid concurrent access to sysinfo
2016-11-08 19:22:09 -08:00
Victor Vieux d3c780bb90 Merge pull request #27745 from vieux/cli_backward_compose_api
allow client to talk to an older server
2016-11-08 18:27:23 -08:00
Darren Stahl ae35c0f70e Stop returning errors that should be ignored while closing stdin
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-08 18:25:43 -08:00
Akihiro Suda 45ed6a7579 opts/mount: add tmpfs-specific options
added following options:

 * tmpfs-size
 * tmpfs-mode

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-11-09 02:01:53 +00:00
John Howard d936a77160 Revendor Microsoft/go-winio to v0.3.6
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-08 17:59:01 -08:00