docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
28,628 Commits 12 Branches 297 Tags
f7a65041fc0436c049e630de1243722e2e685d74
Commit Graph

28628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
f7a65041fc Convert err description to lower 
Convert this to lower before checking the message of the error.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 47637b49a0fbd62a25702859f0993666c63ff562
Component: engine
 2016-11-08 14:42:54 -08:00
Michael Crosby
64d7644ec8 Replace grimes with tini 
There is no reason to duplicate efforts and tini is well built and
better than grimes.  It is a much stronger option for the default init
and @krallin has done a great job maintaining it and helping make
changes so that it will work with Docker.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d58b47623b252803f5cd12f6d9ca584d1587ab22
Component: engine
 2016-11-08 14:42:54 -08:00
Alexander Morozov
df37726742 Merge pull request #28167 from mlaventure/update-containerd 
Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531
Upstream-commit: ff41cecc17d1396c8aec195610e2f72906160469
Component: engine
 2016-11-08 14:25:16 -08:00
Vincent Demeester
bfad529f12 Merge pull request #28170 from icecrime/poule_rebuild_all 
poule: add `rebuild/*` to rebuild all at once
Upstream-commit: 4c6db5d9cb4021dab3021008648d2d56f08792cd
Component: engine
 2016-11-08 22:37:33 +01:00
Victor Vieux
dba3070e3b Merge pull request #28178 from Microsoft/jjh/limited-typo 
Fix typo 'limitied' in error message
Upstream-commit: bbb645e84b683b00abab4a01538e5ee466a71f2e
Component: engine
 2016-11-08 13:36:03 -08:00
John Howard
8101ecbf52 Fix typo limitied 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 27de9f6ece0f62dbdf2a6bfa12cf3019f25e78fa
Component: engine
 2016-11-08 13:06:24 -08:00
Victor Vieux
05466ddbca Merge pull request #28147 from yongtang/27567-service-update-docs-plural-form 
Change to plural forms for help output of `docker service update`
Upstream-commit: fb9aca312802870add3a88d45d7a1c45f7fab327
Component: engine
 2016-11-08 11:14:40 -08:00
Victor Vieux
a91e44839b Merge pull request #28166 from vdemeester/dont-use-pkg-integration-in-other-pkg 
Remove use of pkg/integration in pkg/idtools
Upstream-commit: ffccf2cab95e05d5c5a883bfe3475ee65a84b16c
Component: engine
 2016-11-08 10:43:45 -08:00
Kenfe-Mickael Laventure
20482eac18 Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531 
This version:
 - properly follow context cancellation on Start and Exec
 - add support for Solaris
 - ensure exec exit events are always seen before init's

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 0aa17f0f6090ddeefaa6a0bc618aeb8baf3afa3f
Component: engine
 2016-11-08 09:47:41 -08:00
Vincent Demeester
5433abf008 Merge pull request #27710 from allencloud/show-num-for-global-service-in-service-ls 
support show numbers of global service in service ls command
Upstream-commit: a70b1d74a040e2c17bba1fe553ccbd293a64703a
Component: engine
 2016-11-08 18:43:53 +01:00
Arnaud Porterie (icecrime)
e79ab7a217 poule: add rebuild/* to rebuild all at once 
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 3d89d694eab1313a66958a3e4b63194935559129
Component: engine
 2016-11-08 09:42:09 -08:00
Brian Goff
4b60a6ae97 Merge pull request #28140 from tonistiigi/update-fifo 
vendor: update fifo to 14056439
Upstream-commit: 16ea0806f8c49f7126d0c244ca363d2327ba7e50
Component: engine
 2016-11-08 12:31:03 -05:00
Sebastiaan van Stijn
e5fe6e7966 Merge pull request #27466 from mrjana/net 
Retry AttachNetwork when it fails to find network
Upstream-commit: 9a61bd05f8c86be2a7f03d57f29991abaae20e5a
Component: engine
 2016-11-08 18:25:45 +01:00
Vincent Demeester
d0ecad688d Remove use of pkg/integration in pkg/idtools 
This remove a dependency on `go-check` (and more) when using
`pkg/idtools`. `pkg/integration` should never be called from any other
package then `integration`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: acf7ce1aa0bcaaf0b541b695ce5fbd22676e9239
Component: engine
 2016-11-08 17:21:02 +01:00
Justin Cormack
dc4e39cec4 Merge pull request #28130 from tophj-ibm/change-jq-syntax-for-old-version-support 
[integration-cli] changes syntax to support older version of jq
Upstream-commit: 3a5a0ef1d4df99452da3f21955030abaf29a2642
Component: engine
 2016-11-08 14:00:59 +00:00
Brian Goff
770f488176 Merge pull request #28152 from AkihiroSuda/fix-tmpfs-ro-mount 
api: fix ReadOnly support for tmpfs
Upstream-commit: 8a396f90f5ff32aee36ada3cfd0a1ed214f0e88e
Component: engine
 2016-11-08 08:59:48 -05:00
Yong Tang
533d6e45ea Change to plural forms for help output of docker service update 
This fix is based on the comment in
https://github.com/docker/docker/pull/27567#discussion_r86910604

Basically, in the help output of `docker service update`, the `--xxx-add`
flags typically have plural forms while `--xxx-rm` flags have singular
forms.

This fix updates the help output for consistency.

This fix also updates the related docs in `service_update.md`.
The help output in `service_update.md` has been quite out-of-sync
with the actual output so this fix replaces the output with the
most up-to-date output.

This fix is related to #27567.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1b42d9d0db4f1eadf0a70424ff829bb3346f7bd9
Component: engine
 2016-11-08 05:53:56 -08:00
Akihiro Suda
d78d9594ad Merge pull request #28158 from lixiaobing10051267/masterMakeSum 
fix using wrong function name for MakeTarSumContext
Upstream-commit: 189727581be77049f7f3234894c3966639808e89
Component: engine
 2016-11-08 22:37:23 +09:00
Akihiro Suda
988bfccd70 Merge pull request #28157 from yuexiao-wang/update-checkpoint 
Update for docker checkpoint
Upstream-commit: cbc511720ab13bff05a66c9fa72f5354b2c7bc94
Component: engine
 2016-11-08 22:36:22 +09:00
Sebastiaan van Stijn
b1990eccbb Merge pull request #28143 from icecrime/poule 
Add poule.yml
Upstream-commit: 14a06cbb29b6100e5705d777ce42b3a375a54542
Component: engine
 2016-11-08 13:09:09 +01:00
Vincent Demeester
032d1bd1bd Merge pull request #28153 from YuPengZTE/devCtx 
context.Context should be the first parameter of a function
Upstream-commit: ec221643587a6c22b7e0ab20087ce97100285fb9
Component: engine
 2016-11-08 12:40:32 +01:00
Vincent Demeester
d07b461649 Merge pull request #28144 from yongtang/11072016-swarmkit-update 
Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
Upstream-commit: 2fa63c90de627423be54a929cb6b023e84123b34
Component: engine
 2016-11-08 12:39:03 +01:00
Vincent Demeester
379e810a82 Merge pull request #27888 from sdurrheimer/zsh-completion-container-subcommand 
Add zsh completion for new 'docker container' subcommands
Upstream-commit: d46c7109b520bfe485b4c9ca5f59a3768b444aa0
Component: engine
 2016-11-08 11:24:28 +01:00
Vincent Demeester
bea6724b50 Merge pull request #28038 from bfirsh/add-validate-swagger 
Validation for swagger.yaml
Upstream-commit: 9075aa4ddd9f721fda24704de5d54bf36445e330
Component: engine
 2016-11-08 10:57:01 +01:00
lixiaobing10051267
7c8e31f530 fix using wrong function name for MakeTarSumContext 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 71f144648af71d8daa6481464707b4f8a9476a3c
Component: engine
 2016-11-08 17:16:13 +08:00
yuexiao-wang
f95b21c73c Update for docker checkpoint 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 90ce77e46a7d84ff801624e105b6c00749d3286c
Component: engine
 2016-11-08 16:56:29 +08:00
Sebastiaan van Stijn
2879129b44 Merge pull request #28117 from ping035627/ping035627-patch-1107 
Modify to improve code readability
Upstream-commit: f5283bd253868b6f27b833e7eb7b6c36d45d2096
Component: engine
 2016-11-08 09:44:45 +01:00
Sebastiaan van Stijn
b9dd501a68 Merge pull request #28156 from albers/completion-service-create--tty 
Add bash completion for `docker service {create,update} --tty`
Upstream-commit: c48c44371b31cf4b3fdb39b2bb209a64debc04c2
Component: engine
 2016-11-08 09:35:17 +01:00
allencloud
2b57d0c977 support show numbers of global service in service ls command 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: ea03f090b8e0d5530c50857f54d8e961f9139b92
Component: engine
 2016-11-08 16:17:15 +08:00
Harald Albers
08efaac2fe Add bash completion for docker service {create,update} --tty 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: bfd8f7a7e15a0a4eece33e545368e915470147e0
Component: engine
 2016-11-08 09:13:23 +01:00
yupeng
9cafe2a9d5 context.Context should be the first parameter of a function 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 4b86bd050b6e4c944407680d99c9ce6f25b8cc53
Component: engine
 2016-11-08 14:51:17 +08:00
Akihiro Suda
e967a9b4b9 api: fix ReadOnly support for tmpfs 
For `--mount type=tmpfs,target=/foo,readonly`, the `readonly` flag was just ignored.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 3e3d3c8086237f4938e3e13561dbc1d41b5c617b
Component: engine
 2016-11-08 06:49:17 +00:00
Daniel Nephin
95849eb6df Merge pull request #28076 from yongtang/25644-docker-service-tty 
Add `--tty` to `docker service create/update`
Upstream-commit: 69efb4652c1f619f64148fd21971ff18ac575899
Component: engine
 2016-11-07 22:15:27 -05:00
Arnaud Porterie (icecrime)
068bff7943 Add poule.yml 
Add configuration for `poule` (https://github.com/icecrime/poule) to
manage GitHub automations.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 7cb1fad4a5d41c58c8510fe301d929cb4ad6027e
Component: engine
 2016-11-07 19:06:35 -08:00
Akihiro Suda
90bd48e381 Merge pull request #28132 from johnstep/win2lin 
TestRunDuplicateMount requires the same host
Upstream-commit: 8937b3593624f7ffc7bf2e98552c74e6300eb0d2
Component: engine
 2016-11-08 11:32:39 +09:00
Yong Tang
22b4540407 Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0 
This fix revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0.

This fix is related to 28031.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f0e2eb24cfb6b1e888a93acc971386130e7e99ba
Component: engine
 2016-11-07 17:57:20 -08:00
Victor Vieux
9254ca1e2c Merge pull request #27923 from vieux/plugin_set_gogogo 
support env for docker plugin set
Upstream-commit: 03da822ee9afa1713fe28c3996b0872a0e228c28
Component: engine
 2016-11-07 17:07:14 -08:00
Victor Vieux
a773a75547 support env for docker plugin set 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: efbed4500e30ff1a0eef4ff71fd46a58363d041b
Component: engine
 2016-11-07 16:59:29 -08:00
Victor Vieux
c56f371dbf Merge pull request #27993 from thaJeztah/add-yakkety-yak 
Add Ubuntu 16.10 Yakkety Yak
Upstream-commit: 8442db98306ccb5217daa2caeeb63087588b56c4
Component: engine
 2016-11-07 16:47:12 -08:00
Tibor Vass
f364a8ccb7 Merge pull request #28056 from LK4D4/solaris_me 
Add functional support for Docker sub commands on Solaris
Upstream-commit: 109c26bd7482280946e356b33f17f4d82112dff3
Component: engine
 2016-11-07 16:46:18 -08:00
Yong Tang
2a49113fdc Add --tty to docker service create/update 
This fix tries to add `--tty` to `docker service create/update`. As was
specified in 25644, `TTY` flag has been added to SwarmKit and is
already vendored.

This fix add `--tty` to `docker service create/update`.

Related document has been updated.

Additional integration tests has been added.

This fix fixes 25644.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 599be5a551bbadf23d76677c7d54c338901781f6
Component: engine
 2016-11-07 16:42:32 -08:00
WangPing
abc011e59f modify to improve code readability 
Signed-off-by: WangPing <present.wp@icloud.com>

align

Signed-off-by: WangPing <present.wp@icloud.com>

align

Signed-off-by: WangPing <present.wp@icloud.com>
Upstream-commit: 2bfd1495de5f0003eaa93ebbb4df376644cdd618
Component: engine
 2016-11-08 08:37:44 +08:00
Michael Crosby
1c3e0e9032 Merge pull request #28118 from runcom/fix-secopts-types 
Fix secopts types
Upstream-commit: 05b249e70f0ccaae2acbbb1546f373cb6bfde292
Component: engine
 2016-11-07 16:32:21 -08:00
Tonis Tiigi
9664466e4b vendor: update fifo to 14056439 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: bebfcade04e72e2f8ca91e645a96a3759198232b
Component: engine
 2016-11-07 16:19:03 -08:00
Tõnis Tiigi
395aa9be88 Merge pull request #27615 from darrenstahlmsft/ExecCloseAsync 
Asynchronously close streams to prevent holding container lock
Upstream-commit: 67b0311c8c77eb8001572148b53410efbaefbdbd
Component: engine
 2016-11-07 16:16:21 -08:00
Misty Stanley-Jones
a152887ed4 Merge pull request #28029 from tealtail/27994-add-service-ls-truncate-opt 
remove COMMAND column from `service ls` output. closes #27994
Upstream-commit: c16860b649ae75f86d085a17958e5397f393c2f1
Component: engine
 2016-11-07 14:39:16 -08:00
Ben Firshman
5a7cb6c536 Add swagger.yaml validation 
- yamllint to ensure it is a valid YAML file
- go-swagger validate to ensure it is a valid swagger file

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 5c4abd107a4e50b9f2d29f98275a5b5b86c5f50f
Component: engine
 2016-11-07 11:03:21 -08:00
Ben Firshman
fffe24070c Fix validation errors in swagger.yaml 
- Some objects were missing `type: "object"`
- Some examples had invalid null values (go-swagger validation
  doesn't support x-nullable, so they have just been removed)
- ImageSummary example was out of date
- Removed timeNano because YAML interprets it as a float, not
  a long (sigh)
- Tidy up archive errors

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: e5e1c7feef3e692c21fc2745368bbcae38e02270
Component: engine
 2016-11-07 11:03:10 -08:00
Ben Firshman
b577b180f8 Add logo to swagger.yaml 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: cd0c0d06665c98d7c80cf77760dc5043ab72d466
Component: engine
 2016-11-07 11:03:09 -08:00
Aaron Lehmann
6a317cb5f3 Merge pull request #25974 from kunalkushwaha/mount-add 
correct handling of volumes while service update.
Upstream-commit: c1cdfe78f6eb71b33afbba4dd2a6a713a959177f
Component: engine
 2016-11-07 10:34:22 -08:00