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

28700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Steve Durrheimer
2477845c35 Move zsh completion logic to new subcommand: tag 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cc879af088f6172f7b94fcfb94ef18716cd0c79f
Component: engine
 2016-11-09 08:15:23 +01:00
Steve Durrheimer
cfdb60cb73 Move zsh completion logic to new subcommand: save 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d2af96342dcbc36dda58a1d1aeaa24072c7a8ee8
Component: engine
 2016-11-09 08:15:22 +01:00
Steve Durrheimer
b343bd70e1 Move zsh completion logic to new subcommand: rm 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e5c98f3887b1b6e2a0deb11bc5d371d5300ca2aa
Component: engine
 2016-11-09 08:15:20 +01:00
Steve Durrheimer
733d81aad9 Move zsh completion logic to new subcommand: push 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 17cdc95a199aa8543aaa90359aa461ad5bf4240d
Component: engine
 2016-11-09 08:15:18 +01:00
Steve Durrheimer
1edb788a77 Move zsh completion logic to new subcommand: pull 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 102742a3cdc3633c8adb28f4f6cccd5028b46039
Component: engine
 2016-11-09 08:15:16 +01:00
Steve Durrheimer
5f05123095 Move zsh completion logic to new subcommand: ls 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c333821334db2c8c1d8e4af73176ec8cdefe4643
Component: engine
 2016-11-09 08:15:14 +01:00
Steve Durrheimer
58ef25601e Move zsh completion logic to new subcommand: load 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c308befdc0f8afa21c0ee7048cec1e5eca9c8da0
Component: engine
 2016-11-09 08:15:13 +01:00
Steve Durrheimer
572723e3ba Add zsh completion logic to new subcommand: inspect 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d0014299b420191ceef627ed8dda809914b9ff4c
Component: engine
 2016-11-09 08:15:11 +01:00
Steve Durrheimer
d6334ea62f Move zsh completion logic to new subcommand: import 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a4656e46f77c11aa27fa8e1f37398ea9b8c4738c
Component: engine
 2016-11-09 08:15:10 +01:00
Steve Durrheimer
0144aba2f6 Move zsh completion logic to new subcommand: history 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2014e787309d3eb1fcf26ffd324deef2c2177d7a
Component: engine
 2016-11-09 08:15:08 +01:00
Steve Durrheimer
34207fe9ff Move zsh completion logic to new subcommand: build 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d3305a17e11233451ed79cb6f2f0f6c8a9b03b94
Component: engine
 2016-11-09 08:15:07 +01:00
Steve Durrheimer
4e97cf792b Add zsh completion for 'docker image' subcommands 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 53a56990c43985f1bacc0c87d92e7cb7743475ae
Component: engine
 2016-11-09 08:15:05 +01:00
Steve Durrheimer
d0a8f76683 Rename zsh images & log complete functions 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2a44da973200258cf80fb9693a4e84211ee3a3d9
Component: engine
 2016-11-09 08:14:40 +01:00
allencloud
0d66e8de2c add short flag for force 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 955c35b6a62f26e7ca36fa6378110ce7af8916a4
Component: engine
 2016-11-09 14:40:47 +08:00
yuexiao-wang
395c5f43b8 Fix the link for plugin documentation 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 701021ebd8f7bba22347be71f58563506fcc7b74
Component: engine
 2016-11-09 13:50:14 +08:00
John Howard
e57bdfb80c Windows: Enable fluentd logdriver 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: cff9679c6cdd0b7f3dc691ed00f294ac93274c1d
Component: engine
 2016-11-08 19:54:57 -08:00
John Howard
5689e4e9c3 Merge pull request #28185 from Microsoft/jjh/concurrentaccess 
Windows: Avoid concurrent access to sysinfo
Upstream-commit: 64a42d656b14a754192c8e682047ca36d92666bc
Component: engine
 2016-11-08 19:22:09 -08:00
Victor Vieux
0fd78d838a Merge pull request #27745 from vieux/cli_backward_compose_api 
allow client to talk to an older server
Upstream-commit: d3c780bb90cb5a087fdbffbb8be14fa5eaacca10
Component: engine
 2016-11-08 18:27:23 -08:00
Darren Stahl
7242352354 Stop returning errors that should be ignored while closing stdin 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: ae35c0f70e96de011ad376c8fffba8e8a52ec21f
Component: engine
 2016-11-08 18:25:43 -08:00
John Howard
389ad4c08e Windows: Avoid concurrent access to sysinfo 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 54e09aa4e26c60deb74f994a08e96abea8fb857e
Component: engine
 2016-11-08 17:52:38 -08:00
Victor Vieux
fc16f27149 Merge pull request #28088 from aluzzardi/service-ps-task-resolution 
service ps: Truncate Task IDs
Upstream-commit: 383a2f046b16c9f79d2fb800844e6550cc784871
Component: engine
 2016-11-08 17:44:15 -08:00
Victor Vieux
cc2d08fb86 Merge pull request #27567 from yongtang/24391-dns-setting 
Add custom DNS settings to service definition
Upstream-commit: 462e57f05eba94cacad2c5e1383d94baf8fe090b
Component: engine
 2016-11-08 17:43:00 -08:00
Victor Vieux
0d0bda3a4b Merge pull request #28171 from tonistiigi/fix-fifo-rm-warn 
Don’t warn on missing fifo
Upstream-commit: c3c58f83b6e49e792e7bb355a0fbe5d1d308cf82
Component: engine
 2016-11-08 17:42:15 -08:00
Victor Vieux
5a46073d11 Merge pull request #28086 from vieux/delete_rootfs_plugin 
delete plugin rootfs on `docker plugin rm`
Upstream-commit: 4b63ad33ec77dbf15879da8ce8a7870d58f562bd
Component: engine
 2016-11-08 17:03:01 -08:00
Sebastiaan van Stijn
067ec4c6cd Merge pull request #27420 from Shugyousha/journaldfixes 
Small logger journald cleanup
Upstream-commit: 3975d648b70f2f18c1ba15c4b590de5c418d34db
Component: engine
 2016-11-09 01:35:08 +01:00