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

30439 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
de1a403810 Merge pull request #30387 from coolljt0725/fix_typo 
typo: fix typo in api documents
 2017-01-24 11:46:44 +01:00
Vincent Demeester
bb9f7cb280 Merge pull request #30371 from albers/completion-fix-plugin-ls 
Fix bash completion for `docker plugin ls`
 2017-01-24 11:46:13 +01:00
Sebastiaan van Stijn
8820266c17 Merge pull request #29900 from yongtang/29226-network-format-created-at 
Add `.CreatedAt` placeholder for `docker network ls --format`
 2017-01-24 11:01:37 +01:00
Vincent Demeester
ac30c4c06c Merge pull request #30385 from aaronlehmann/vendor-swarmkit-grpc-containerd 
Vendor swarmkit, containerd, and related dependencies
 2017-01-24 11:00:35 +01:00
Vincent Demeester
0ca4995ca8 Merge pull request #29301 from miaoyq/improve-print-info-for-inspect 
Improve the error print of image inspect
 2017-01-24 10:56:24 +01:00
Yanqiang Miao
cc9ed0a31b Improve the error print of image inspect 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-01-24 11:07:20 +08:00
Lei Jitang
2f0d494682 typo: fix typo in api documents 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2017-01-23 22:05:44 -05:00
Akihiro Suda
929ae4a0b6 Merge pull request #30375 from albers/completion-service-ps--filter-node 
Add bash completion for `docker service ps --filter node`
 2017-01-24 11:49:16 +09:00
Brian Goff
5e46ad159d Merge pull request #30306 from AkihiroSuda/update-proxy 
update docker-proxy to 7b2b1feb1de4817d522cc372af149ff48d25028e
 2017-01-23 21:07:25 -05:00
Aaron Lehmann
3e987e1732 Vendor swarmkit, containerd, and related dependencies 
Update swarmkit to 037b491.

As swarmkit switched to a newer gRPC version, this also involves
updating Docker's vendored gRPC, which in turn requires updating
containerd to a new version that has protobufs generated against this
gRPC version.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-23 17:51:14 -08:00
Sebastiaan van Stijn
f633764913 Merge pull request #30262 from aaronlehmann/text-html 
distribution: Add text/html and application/json as image mediatypes
 2017-01-24 01:13:35 +01:00
Anusha Ragunathan
99d3b26346 Merge pull request #30294 from tiborvass/plugin-rexray-docs 
plugins: add example docs for a rexray plugin
 2017-01-23 15:48:20 -08:00
Tibor Vass
5f713cecc5 plugins: add example docs for a rexray plugin 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-01-23 15:41:35 -08:00
Sebastiaan van Stijn
7fed0830f3 Merge pull request #30211 from thaJeztah/fix-content-trust-flags 
fix flag descriptions for content-trust
 2017-01-23 23:52:11 +01:00
Vincent Demeester
eac3e4b5dd Merge pull request #29883 from dnephin/update-to-latest-schema 
Update compose schema v3
 2017-01-23 23:18:31 +01:00
Brian Goff
b157b3c648 Merge pull request #30318 from sdurrheimer/zsh-completion-init 
Add zsh completion for 'dockerd --init' and 'docker {create,run} --init'
 2017-01-23 16:28:25 -05:00
Aaron Lehmann
062f2a3eae Merge pull request #30139 from Microsoft/jjh/sequential 
Windows: Use sequential file access
 2017-01-23 12:46:06 -08:00
John Howard
c98e77c77c Windows: Use sequential file access 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-01-23 10:25:36 -08:00
Harald Albers
a39a2bb6c2 Add bash completion for docker service ps --filter node 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-01-23 19:05:00 +01:00
Harald Albers
72bd2f8fd3 Fix bash completion for docker plugin ls 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-01-23 18:24:51 +01:00
Anusha Ragunathan
8bb8ac7f78 Merge pull request #29088 from yongtang/28708-plugin-list-format 
Add `--format` flag for `docker plugin ls`
 2017-01-23 08:49:28 -08:00
Sebastiaan van Stijn
bb3c0b2466
fix flag descriptions for content-trust 
Commit ed13c3abfb added flags
for Docker Content Trust. Depending on the `verify` boolean,
the message is "Skip image verification", or "Skip image signing".
"Signing" is intended for `docker push` / `docker plugin push`.

During the migration to Cobra, this boolean got flipped for
`docker push` (9640e3a451),
causing `docker push` to show the incorrect flag description.

This patch changes the flags to use the correct description
for `docker push`, and `docker plugin push`.

To prevent this confusion in future, the boolean argument
is removed, and a `AddTrustSigningFlags()` function is added.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-01-23 14:52:36 +01:00
Vincent Demeester
4f926b67f4 Merge pull request #30351 from friism/patch-9 
remove indent from .dockerignore example
 2017-01-23 11:30:23 +01:00
Vincent Demeester
baecb6f499 Merge pull request #30272 from AkihiroSuda/fix-cli-json 
Fix broken JSON support in cli/command/formatter
 2017-01-23 11:03:18 +01:00
Sebastiaan van Stijn
b319221c21 Merge pull request #30334 from mstanleyjones/master 
Fixing formatting errors in Run refdoc
 2017-01-22 23:02:59 +01:00
Michael Friis
0f5a98122f remove indent from .dockerignore example 
Signed-off-by: Michael Friis <friism@gmail.com>
 2017-01-22 10:46:04 -08:00
Anusha Ragunathan
6d6a7fc70c Add bash completion for newly added options to "docker plugin ls" 
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
 2017-01-20 15:59:44 -08:00
Yong Tang
1c0d37fa7f Add --format flag for docker plugin ls 
This fix tries to address the enhancement discussed in 28735 to add
`--format` for the output of `docker plugin ls`.

This fix
1. Add `--format` and `--quiet` flags to `docker plugin ls`
2. Convert the current implementation to use `formatter`, consistent with
   other docker list commands.
3. Add `pluginsFormat` for config.json.

Related docs has been updated.

Several unit tests have been added to cover the changes.

This fix is related to 28708 and 28735.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-01-20 15:59:44 -08:00
Tibor Vass
7a97705b52 Merge pull request #29959 from cpuguy83/master_fix_selinux_packaging 
[master] Fix conflicts with newly updated selinux policies
 2017-01-20 15:13:18 -08:00
Victor Vieux
74ed368e7a Merge pull request #30329 from johndmulhausen/patch-2 
Fixing formatting errors in Run refdoc

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-01-20 14:47:18 -08:00
Justin Cormack
0a08f7a1d4 Merge pull request #30319 from vdemeester/integration-fix-testbuildcopywilcardinname 
Run TestBuildCopyWilcardInName only on linux daemon and unix client
 2017-01-20 22:04:56 +00:00
Tibor Vass
2b89356c07 Merge pull request #30145 from anusha-ragunathan/ps-swarm 
Pass plugingetter as part of swarm node config.
 2017-01-20 10:35:49 -08:00
Tõnis Tiigi
0566f3ffc4 Merge pull request #30223 from mlaventure/fix-logwatcher-deadlock 
Close logwatcher on context cancellation
 2017-01-20 10:14:37 -08:00
Alexander Morozov
50a72c7467 Merge pull request #28454 from glensc/init-args 
do not require custom build of tini
 2017-01-20 10:03:58 -08:00
Daniel Nephin
de1ffebf19 Update Compose schema to match docker-compose. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-20 12:36:57 -05:00
Sebastiaan van Stijn
ae99820357 Merge pull request #30282 from sdurrheimer/zsh-completion-swarm-join-availability 
Add zsh completion for 'docker swarm --availability'
 2017-01-20 17:52:06 +01:00
Sebastiaan van Stijn
156d402133 Merge pull request #30317 from sdurrheimer/zsh-completion-prune-filter 
Add zsh completion for 'docker {container,image,network,system} prune --filter
 2017-01-20 16:25:42 +01:00
Vincent Demeester
e47c46c713
Run TestBuildCopyWilcardInName only on linux daemon and unix client 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-01-20 16:10:28 +01:00
Steve Durrheimer
cdf57782fd
Add zsh completion for 'dockerd --init' and 'docker {create,run} --init' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-01-20 16:06:22 +01:00
Steve Durrheimer
784ebccffa
Add zsh completion for 'docker {container,image,network,system} prune --filter' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-01-20 15:49:21 +01:00
Vincent Demeester
ba4f8f06b3 Merge pull request #29147 from Microsoft/jjh/makeroot 
Windows: make.ps1 calc root
 2017-01-20 15:01:58 +01:00
Akihiro Suda
5b16c4c800 Merge pull request #27510 from chipironcin/master 
Improve error message
 2017-01-20 21:47:30 +09:00
Akihiro Suda
541aa27d03 update docker-proxy to 7b2b1feb1de4817d522cc372af149ff48d25028e 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-01-20 06:18:12 +00:00
Anusha Ragunathan
eb13865d4e Vendor swarmkit 
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
 2017-01-19 17:20:33 -08:00
Anusha Ragunathan
fa784951ba Pass plugingetter as part of swarm node config. 
This is necessary for swarmkit to support cluster wide plugins, such as
globally scoped network plugins.

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
 2017-01-19 17:11:12 -08:00
Sebastiaan van Stijn
af90d50647 Merge pull request #29988 from yongtang/29936-insecure-registries 
Return error when insecure registry contains scheme
 2017-01-19 21:49:06 +01:00
Aaron Lehmann
a215e15cb1 distribution: Add text/html and application/json as image mediatypes 
As noted by #30083, the new strict checking of mediatypes misses some
cases where earlier bugs caused nonstandard mediatypes to be stored in
manifests. Two of the known cases are text/html and application/json,
which were returned by certain registries and stored by earlier versions
of Docker. Add special cases for text/html and application/json.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-19 11:16:28 -08:00
Aaron Lehmann
a992ff9fec Merge pull request #29980 from allencloud/fix-29520-info-incorrectness 
return error when listNode fails
 2017-01-19 10:41:02 -08:00
Sebastiaan van Stijn
de0328560b Merge pull request #30165 from xulike666/fix-typo-6/36 
[combined] fix typo
 2017-01-19 17:21:22 +01:00
Steve Durrheimer
ee2ce82c61
Add zsh completion for 'docker swarm --availability' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-01-19 16:54:36 +01:00