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

28328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darren Stahl
b8d232c6a7 Windows: Rename layers before deletion 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: be68006d1928b34936050175e67f85b4ee7f67cf
Component: engine
 2016-11-01 18:05:09 -07:00
Brian Goff
39c0d0f084 Merge pull request #27648 from dnephin/swagger-gen-operations 
Generated more api types from swagger spec
Upstream-commit: 2fc760496b24cc1d42d5527ec593b0e1b1701d54
Component: engine
 2016-10-31 15:33:16 -04:00
Sebastiaan van Stijn
0fa1e11138 Merge pull request #27907 from vdemeester/pr-27822 
Updating aws-sdk-go to version 1.4.22
Upstream-commit: 88c825268686e633603f64a75b805e0294aee02c
Component: engine
 2016-10-31 11:21:06 -07:00
Vincent Demeester
d674b1fc4d Merge pull request #27884 from Microsoft/jjh/copyfiletodot 
Windows: Fix COPY file . after WORKDIR
Upstream-commit: a0629eab7302bef57c9ce9930b24f59f751303d7
Component: engine
 2016-10-31 17:54:44 +01:00
Laura Frank
68afbb36f4 Updating aws-sdk-go to version 1.4.22 
Signed-off-by: Laura Frank <ljfrank@gmail.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ba4e0c328f96e6a6caa6c67e3ee4d446d75a584f
Component: engine
 2016-10-31 09:23:45 -07:00
Brian Goff
cc1e62247e Merge pull request #27782 from tombooth/27779-decouple-watcher-close 
Decouple removing the fileWatcher from reading
Upstream-commit: 0cdcb9ea7350b1e0a024bf40c8cf60e541f2c69f
Component: engine
 2016-10-31 11:50:26 -04:00
Daniel Nephin
2c5782817e Generate ContainerWait response from the swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 181562c2e54225d6ce737d98b03d3157451a5dbc
Component: engine
 2016-10-31 11:19:53 -04:00
Daniel Nephin
bc7bcb9601 generate AuthResponse type from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2732b8a9bb3edb92121d0b0dcc144e5f557e2fbf
Component: engine
 2016-10-31 11:16:03 -04:00
Daniel Nephin
1b85879c03 Generate container update response from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f196cf6a090556ccb42198043a71d133482b510d
Component: engine
 2016-10-31 11:16:02 -04:00
Daniel Nephin
1759ab5e8b Use IDResponse for container create response. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c8d5e7203e1ae140a5cca312b6699063b521cf83
Component: engine
 2016-10-31 11:16:02 -04:00
Daniel Nephin
01541139a5 Add an IDResponse type 
Generated from a swagger spec and use it for container exec response

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 01883c136d9ef06962d80aa81e27d1d90eb6d199
Component: engine
 2016-10-31 11:16:02 -04:00
Daniel Nephin
913e9a48c1 Generate container create response from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bad849fc826b410c3aeb753a8c7f6b38f7ae12b0
Component: engine
 2016-10-31 11:16:02 -04:00
Daniel Nephin
dc10e9a664 Use a config to generate swagger api types 
Moves the resposne types to a package under api/types

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 29df3bdb117a058ae040686dd0f2565ae9ad743a
Component: engine
 2016-10-31 11:13:41 -04:00
Daniel Nephin
52c74e2725 Update to inline comments. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8f81bb92a3e528d0b5facadd55738aefc279caf8
Component: engine
 2016-10-31 11:13:41 -04:00
Daniel Nephin
b705a36179 Cleanup network swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 52a4737319b4008a0b636319905e2bfc7b3225ad
Component: engine
 2016-10-31 11:13:41 -04:00
Daniel Nephin
d19255532a Generate VolumesCreateRequest from the swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5c2498fd3c41f4badb1788665886d30772537f73
Component: engine
 2016-10-31 11:13:41 -04:00
Daniel Nephin
fa3a1f0666 Generate ErrorResponse struct from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bc757385455dee272ca563031afece05c935320b
Component: engine
 2016-10-31 11:13:41 -04:00
Daniel Nephin
914619c6f3 Cleanup volume swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 84a39c0830a3c9fa91d65db201ed9a925af7bfe6
Component: engine
 2016-10-31 11:13:41 -04:00
Daniel Nephin
31c5c30bb3 Generate VolumeList response from the swagger spec 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d459e83b1c993d63d5f94b85a7f8ddf3ac01beae
Component: engine
 2016-10-31 11:13:41 -04:00
John Howard
27e4d0d0fb Windows: Fix COPY file . after WORKDIR 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f0b93b6ed8b4c0776065be972b4d5b4611f25fbf
Component: engine
 2016-10-30 13:12:27 -07:00
Vincent Demeester
d375460d63 Merge pull request #27879 from sdurrheimer/zsh-completion-ps-health-filter 
Add zsh completion for 'docker ps --filter health='
Upstream-commit: 17aaa0890a7f53cbd9c8806a93de73898ea92813
Component: engine
 2016-10-29 19:23:55 +02:00
Sebastiaan van Stijn
596b96c39e Merge pull request #27881 from albers/completion-ps--filter-health 
Add bash completion for `docker ps --filter health`
Upstream-commit: e1369f2f394bde84f9d0a3b262a9ce94971e039b
Component: engine
 2016-10-29 10:05:24 -07:00
Doug Davis
d4dfe8f046 Merge pull request #27878 from hqhq/fix_typos 
Fix bunch of typos
Upstream-commit: 72ec0f3488324e1cd622b78e3ea746981f558b60
Component: engine
 2016-10-29 07:50:45 -04:00
Harald Albers
4011d7083d Add bash completion for docker ps --filter health 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5e6a59b59f567d5e69d9ae9df98a89a69b2664bd
Component: engine
 2016-10-29 04:26:08 -07:00
Steve Durrheimer
1fda59702c Add zsh completion for 'docker ps --filter health=' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8df3d6a2a7e02ff1c7baf0a273d20b2422e38f39
Component: engine
 2016-10-29 12:13:29 +02:00
Qiang Huang
34bac6f06e Fix bunch of typos 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883
Component: engine
 2016-10-29 15:03:26 +08:00
Vincent Demeester
0be42defbd Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format 
Fixes #24022 - Adds container health support to docker ps filter/format
Upstream-commit: 515e5dade7a006dbd2c42880f1af695da22ece60
Component: engine
 2016-10-29 06:56:06 +02:00
Sebastiaan van Stijn
d85153c870 Merge pull request #27874 from duglin/addComment 
Add a comment about how we don't mkdir during WORKDIR directly
Upstream-commit: 507b4e9e4aed26170802b2691e47c59b2c6cf403
Component: engine
 2016-10-28 21:03:47 -07:00
Doug Davis
0d12f299cb Add a comment about how we don't mkdir during WORKDIR directly 
Just to help the next time someone goes looking for it while debugging.
Like @jhowardmsft and I did while looking at #27545.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9f79043a63302258a597a69b0c5ec5e09a480ac0
Component: engine
 2016-10-28 19:24:37 -07:00
Vincent Demeester
4e9b278e51 Merge pull request #27840 from estesp/add-userns-status-to-info 
Add "userns" to `docker info` security options output
Upstream-commit: 1fb9c4e89188f48c79889f6128fdec865bed467d
Component: engine
 2016-10-29 02:58:34 +02:00
Sebastiaan van Stijn
ed6994ddbe Merge pull request #27844 from LK4D4/fix_build_rpm 
project: fix build rpm
Upstream-commit: cff976a0b8a52ff2baee3f3cc503276862278153
Component: engine
 2016-10-28 16:50:58 -07:00
Sebastiaan van Stijn
092d6f43e2 Merge pull request #27867 from Microsoft/jjh/difftest 
Windows: Port a docker diff test
Upstream-commit: a0eae7e3c0e037f73445a4f77a4dfcd1042be75c
Component: engine
 2016-10-28 16:44:03 -07:00
Sebastiaan van Stijn
e28a436d48 Merge pull request #26857 from thaJeztah/docs-add-missing-IPAM-options 
docs: add missing IPAM options to API docs
Upstream-commit: a9753c333fe62ec761af8487a88da713451a0c36
Component: engine
 2016-10-28 16:25:23 -07:00
Sebastiaan van Stijn
3b7e266f9c docs: add missing IPAM options to API docs 
Commit dd28ded711417c72d2e228d1ace129ac5fd05f19
brought in new networking features and API, but
did not document the available IPAM options.

This adds a description of those options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d69fce79f94b807ccb0f2f64c47881ee8fc31250
Component: engine
 2016-10-28 16:18:49 -07:00
Phil Estes
68b003581b Add "userns" to docker info security options output 
If user namespaces is enabled on the daemon, reveal that via docker info
by adding "userns" to the list of security options reported by the
info endpoint.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: ae74092e450f1f2665b90257b65513cc0c19702f
Component: engine
 2016-10-28 19:16:57 -04:00
Anusha Ragunathan
8d3cacc3b2 Merge pull request #27804 from anusha-ragunathan/blacklist-authz 
Blacklist authz plugins that failed.
Upstream-commit: 406c19f0961c5987c8ce3f980b6fbf36e845f9c4
Component: engine
 2016-10-28 15:06:20 -07:00
Vincent Demeester
2f6eac7cd7 Merge pull request #27851 from yuexiao-wang/add-format 
Add --format to man and fix some typos
Upstream-commit: 9ddbaddedc13ce8be238331176a22be55eb1808f
Component: engine
 2016-10-28 23:58:20 +02:00
Alexander Morozov
30520bd0c0 project: fix build rpm 
* change workdir for accessing install-binaries.sh
* use other gopath for binaries to preserve sources
* add sources of proxy and grimes to rpc spec
* use dynamic proxy with -linkmode external in deb and rpm

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bf0fe87fe6acb0ad55539fdfa565dcdca8e343a5
Component: engine
 2016-10-28 14:34:17 -07:00
Sebastiaan van Stijn
6c60350948 Merge pull request #27871 from yongtang/10282016-docs-max-concurrent-downloads-uploads 
Update docs for dockerd.md about `max-concurrent-downloads/max-concurrent-uploads`
Upstream-commit: 0fb23fb6bc59f406a7e532385f27e31374260966
Component: engine
 2016-10-28 14:32:48 -07:00
Sebastiaan van Stijn
1d53ce0487 Merge pull request #27870 from vdemeester/update-events-manpage-with-filters 
Complete docker-events man page with filter list…
Upstream-commit: f190c7053ec5343e2b5ffe7d6debf54173d28df2
Component: engine
 2016-10-28 14:22:02 -07:00
Yong Tang
ab40031c77 Update docs for dockerd.md about max-concurrent-downloads/max-concurrent-uploads 
It seems that `max-concurrent-downloads` and `max-concurrent-uploads`
are supported in Windows for `config.json`. Though that was not
mentioned in the docs for dockerd.md.

This fix adds the following to the example `config.json` file for Windows:
```
    "max-concurrent-downloads": 3,
    "max-concurrent-uploads": 5,
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1f660febbd114f40e5232ba3137ac4f912ab53cc
Component: engine
 2016-10-28 14:11:18 -07:00
Sebastiaan van Stijn
6aae774656 Merge pull request #27863 from Microsoft/jjh/clarifyworkdir 
Windows: Clarify WORKDIR in docs
Upstream-commit: beccf0f8986d1182fc2b3e192508d1309d5fc5c1
Component: engine
 2016-10-28 14:07:03 -07:00
Michael Crosby
7523d02582 Merge pull request #27800 from lilybguo/group-add-rm 
Service create --group param
Upstream-commit: 91f477b8309fd09f27d613c1c3bfc7afb2fd137c
Component: engine
 2016-10-28 14:01:53 -07:00
Sebastiaan van Stijn
d280390d0c Merge pull request #24725 from yongtang/24693-dockerfile-empty-line-after-escape 
Fix dockerfile parser with empty line after escape
Upstream-commit: c5adc271b2991c1eb8a25cdab14e425edb2cd99b
Component: engine
 2016-10-28 13:53:15 -07:00
Lily Guo
ed2e1f6e2b Service create --group param 
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646

Signed-off-by: Lily Guo <lily.guo@docker.com>

Update flag documentation

Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups

Signed-off-by: Lily Guo <lily.guo@docker.com>

Fix docs for groups and update completion scripts

Signed-off-by: Lily Guo <lily.guo@docker.com>
Upstream-commit: 2f58494ae6e796325329f849cf547bcf94bb68e3
Component: engine
 2016-10-28 13:26:31 -07:00
Victor Vieux
94a4717dfa Merge pull request #27758 from anusha-ragunathan/fix-overflow 
Fix stack overflow in ErrInAdequateCapacity.
Upstream-commit: c73dd3fe7b0ef6c8e4e16a72b22f32f33113fac1
Component: engine
 2016-10-28 13:10:54 -07:00
Vincent Demeester
ce1517234b Complete docker-events man page with filter list… 
… and examples.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7d1fa716758abc455c6cf037ee3862fb7c848486
Component: engine
 2016-10-28 13:07:00 -07:00
Misty Stanley-Jones
41f493236b Merge pull request #27819 from lixiaobing10051267/masterDirInvalid 
fill all the rest invalid address because no related directory
Upstream-commit: 010ee5a8e84b3bb5f5a79690e77fd9b135643641
Component: engine
 2016-10-28 13:05:18 -07:00
Misty Stanley-Jones
b0519ec516 Merge pull request #27815 from lixiaobing10051267/masterDocsDel 
fill the complete address because of no userguide directory
Upstream-commit: cfe7cb0292eb9654fba13d380ead30f2525d09df
Component: engine
 2016-10-28 13:04:04 -07:00
Vincent Demeester
86df94b9ba Merge pull request #27369 from cezarsa/hc 
Add --health-* flags to service create and update
Upstream-commit: f860289131e36ad2dde5ebe60d15a86fd97934b5
Component: engine
 2016-10-28 21:59:52 +02:00