docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
23,627 Commits 12 Branches 296 Tags
e4a68dcb3126bed44496e2ff89b2bf568c482eb8
Commit Graph

23627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
e4a68dcb31 Merge pull request #21908 from sdurrheimer/zsh-completion-volume-ls-filter 
Add zsh completion for 'docker volume ls -f {dangling,driver,name}'
Upstream-commit: 8af70e107438382e599baa42b8a06c0d972e1bd5
Component: engine
 2016-04-11 12:24:48 +02:00
Vincent Demeester
49b592321a Merge pull request #21919 from MihaiB/docs-typo 
docs: fix grammar typo in 'Network containers'
Upstream-commit: c327d9d99b333932465d09d3cb8caecb5d317280
Component: engine
 2016-04-10 22:33:55 +02:00
Mihai Borobocea
d40ee881f1 docs: fix grammar typo in 'Network containers' 
Signed-off-by: Mihai Borobocea <MihaiBorob@gmail.com>
Upstream-commit: a609c2c48b5d504120777db2ac1ba83bfe355b66
Component: engine
 2016-04-10 17:22:02 +03:00
Steve Durrheimer
22b918f431 Add zsh completion for 'docker volume ls -f {dangling,driver,name}' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 7ad5438555c9fbe5dc3b82f993db73862974280a
Component: engine
 2016-04-10 12:52:33 +02:00
Vincent Demeester
de9c8f2b5f Merge pull request #21917 from sdurrheimer/zsh-completion-new-micro-syslog-format 
Add zsh completion for '--log-opt syslog-format=rfc5424micro'
Upstream-commit: 3c3b089474c387073e2088572e84e5d5aa05634c
Component: engine
 2016-04-10 11:32:48 +02:00
Steve Durrheimer
b51f29d979 Add zsh completion for '--log-opt syslog-format=rfc5424micro' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 553435499670a0a2408ace95a5f6b19d4737a648
Component: engine
 2016-04-10 11:11:12 +02:00
Vincent Demeester
b83c7378b4 Merge pull request #21724 from flyinprogrammer/syslog-opts-env-labels 
enable syslog logger to have access to env and labels
Upstream-commit: f9386538ec6744512a07b61fe06e953b52065ead
Component: engine
 2016-04-10 10:58:25 +02:00
Lei Jitang
afb9d9b8d8 Merge pull request #21854 from WeiZhang555/restart-failure 
Fix critical bug: can't restart an restarting container
Upstream-commit: b4664e3f8669ca02925c31a08822b73ee7969bd5
Component: engine
 2016-04-10 11:17:19 +08:00
Vincent Demeester
72fdd1b243 Merge pull request #21907 from sdurrheimer/zsh-completion-syslog-format 
Add zsh completion for '--log-opt syslog-format'
Upstream-commit: 37d2e12faef82dfbfffb7da3fa8f9bf5d8db24e5
Component: engine
 2016-04-09 23:24:33 +02:00
Vincent Demeester
60e79acdb1 Merge pull request #21911 from yongtang/04092016-doc-remote-api-json 
Fix incorrect request json body for `/containers/create` in remote API docs.
Upstream-commit: 0f904dc2561e7d5c4a0a9435610132e94de377a1
Component: engine
 2016-04-09 22:56:00 +02:00
Sebastiaan van Stijn
212dd88448 Merge pull request #21819 from tophj-ibm/fix-ensure-emptyfs-other-architectures 
Fix .ensure-emptyfs on non-x86_64 architectures
Upstream-commit: 3f39035f1862b20aa59c0e26f42794df9ff731bc
Component: engine
 2016-04-09 13:40:45 -07:00
Yong Tang
8e90b734bc Fix incorrect request json body for /containers/create in remote API docs. 
This fix tries to fix the incorrect request json body for
`/containers/create` in remote API docs.

When using the example json request for `/containers/create`, there are two
errors:
(1). `invalid character '"' after object key:value pair`
     This is because a `,` is missing after `"Volumes": {}`
     This issue exists in v1.20-v1.24
(2). `Invalid --security-opt: ""`
     This is becasue in `"SecurityOpt": [""]` line, an empty string
     `""` is passed yet `""` is not a valid `SecurityOpt`. Either no string,
     or a valid string (e.g., "no-new-privileges") could be used.
     This issue exists in v1.15-v1.24

This fix updates the docs and correct the above two issues.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f919a26a9fb96ef07133183b4f693ff9508ae823
Component: engine
 2016-04-09 18:39:33 +00:00
Vincent Demeester
329133f6f0 Merge pull request #21905 from npcode/docs-authorization-RequestUri 
Fix errata; s/RequestUri/ReqestURI/
Upstream-commit: 4ac59a12824059f1323e5faee78a37f4612ed54f
Component: engine
 2016-04-09 18:51:20 +02:00
Vincent Demeester
6009e3b566 Merge pull request #21906 from allencloud/fix-typos-pkg 
fix typos in pkg
Upstream-commit: 417fce0b77d21d8481c6e8b0cad6cb25c6da7bb8
Component: engine
 2016-04-09 18:50:42 +02:00
Steve Durrheimer
f17ace9c5a Add zsh completion for '--log-opt syslog-format' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 6e14ebd030ac8803438a183d5135100320caa035
Component: engine
 2016-04-09 17:34:46 +02:00
allencloud
f4582c23f4 fix typos in pkg 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: aef02273d9cdf8144b95c9c9a8d1e119d24b2d9d
Component: engine
 2016-04-09 21:18:15 +08:00
Vincent Demeester
9a26745f83 Merge pull request #21853 from coolljt0725/fix_stats 
Fix docker stats missing mem limit
Upstream-commit: a01f4dc2292ecba30b1e3db3251e6408610f8c8f
Component: engine
 2016-04-09 13:46:58 +02:00
Yi EungJun
d74513a461 Fix errata; s/RequestUri/ReqestURI/ 
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: 94985b4bfff4fec6f4a7cb0b0f8b641a7dcfcbd1
Component: engine
 2016-04-09 19:19:35 +09:00
John Howard
c32760ad06 Merge pull request #21740 from mindlapse/fixErrorMsg 
Improved message when pushing a non-existant image
Upstream-commit: f2ed337ac9834b600dbe5afbdaa2146c9e5d71c1
Component: engine
 2016-04-08 20:53:25 -07:00
John Howard
9499ce7691 Merge pull request #20525 from Microsoft/sjw/update-graphdriver-create 
Adding readOnly parameter to graphdriver Create method
Upstream-commit: fec6cd2eb988f77d7442fd8edd8cc864c87ae88b
Component: engine
 2016-04-08 20:44:03 -07:00
Sebastiaan van Stijn
36fb308b83 Merge pull request #21868 from anusha-ragunathan/not-exp-requirement 
Add non-experimental daemon as a test requirement.
Upstream-commit: fd67c8b2031722dd9255996b84bbfb236ce45cfb
Component: engine
 2016-04-08 17:55:16 -07:00
Sebastiaan van Stijn
d050e36225 Merge pull request #21839 from WeiZhang555/add-start-event 
Add missing "start" event back for auto-restart container
Upstream-commit: eaa1e8a8c49c58fb3770d673c8c7dcd4c1da4d17
Component: engine
 2016-04-08 17:52:22 -07:00
Alan Scherger
c931d8e5af enable syslog logger to have access to env and labels 
Signed-off-by: Alan Scherger <flyinprogrammer@gmail.com>
Upstream-commit: f67b7112775fd9957cc156cc4483e11b8c0c981a
Component: engine
 2016-04-08 19:50:18 -05:00
Sebastiaan van Stijn
13c194134a Merge pull request #21900 from vieux/type 
fix typo in comment
Upstream-commit: 3bac588335bd2af28726bc803885fc0b2ae73554
Component: engine
 2016-04-08 17:46:41 -07:00
David Calavera
ac13b98614 Merge pull request #21894 from Microsoft/sjw/nanoserver-fix 
Fixing warning to correctly output error string.
Upstream-commit: f62b26571a2727b1fabfb7e88cbdbcfa2144a1fa
Component: engine
 2016-04-08 16:43:07 -07:00
Stefan J. Wernli
e1f6a69273 Fixing warning to correctly output error string. 
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 3c220cfcbad901c9366c209e83dc917ee4cf4f0c
Component: engine
 2016-04-08 15:04:04 -07:00
David Calavera
f6e6559025 Merge pull request #21773 from yongtang/21765-stats-HumanSize-to-BytesSize 
Change HumanSize to BytesSize for memory output in `docker stats`.
Upstream-commit: a3007ceccc6b0bc7c79f0c63254f70b899299597
Component: engine
 2016-04-08 14:56:22 -07:00
Christopher Jones
a54dc68a13 Fix .ensure-emptyfs on non-x86_64 architectures 
Now that we are checking if the image and host have the same architectures
via #21272, this value should be null so that the test passes on non-x86
machines

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 1f59bc8c03df18686b93a0cd619cf2c55cbcf421
Component: engine
 2016-04-08 17:38:13 -04:00
Sebastiaan van Stijn
6787b6d232 Merge pull request #21884 from albers/completion-volume-ls-filter 
bash completion for `docker volume ls -f {driver,name}`
Upstream-commit: f832183e33a690e297bd6dacf7a9cd812025daac
Component: engine
 2016-04-08 14:33:09 -07:00
Yong Tang
a5c656d2b9 Change HumanSize to BytesSize for memory output in docker stats. 
This fix tries to fix the discrepancy between `docker stats` and
`docker run` where `docker run` uses RAMInBytes for all memory
related inputs but `docker stats` uses HumanSize for all memory
related outputs.

To be consistent, `docker stats` needs to use BytesSize for all
memory related outputs to conform to RAMInBytes in `docker run`.

This fix addresses this issue. As BytesSize is used, the test
cases needs to be adjusted to match `KiB/MiB/GiB` instead of
`KB/MB/GB`.

The documentation has also been updated.

This fix fixes #21765.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0e3846e280195cb47c47a7739b475b281dd301cb
Component: engine
 2016-04-08 20:01:50 +00:00
David Calavera
2d17cc1e1d Merge pull request #21760 from hqhq/hq_minimum_reservation 
Add minimum limit for memory reservation
Upstream-commit: e626011bfb139346570a3b6320c0bad3f6c29b0c
Component: engine
 2016-04-08 07:58:28 -07:00
David Calavera
59c3fd56d3 Merge pull request #21883 from albers/completion-syslog-format 
bash completion for `--log-opt syslog-format`
Upstream-commit: 1e9115ced45a2a71072d05bfda0106ee11746372
Component: engine
 2016-04-08 07:54:53 -07:00
Zhang Wei
1a5ffe3e32 Fix critical bug: can't restart a restarting container 
When user try to restart a restarting container, docker client report
error: "container is already active", and container will be stopped
instead be restarted which is seriously wrong.

What's more critical is that when user try to start this container
again, it will always fail.

This error can also be reproduced with a `docker stop`+`docker start`.

And this commit will fix the bug.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: a705e166cf3bcca62543150c2b3f9bfeae45ecfa
Component: engine
 2016-04-08 22:02:30 +08:00
Brian Goff
6f10eaf3f8 Merge pull request #21777 from Microsoft/jjh/killTP4 
Windows: So long TP4, so long...
Upstream-commit: 7f865e49538a2391d26de795efc0981a6db02127
Component: engine
 2016-04-08 09:33:23 -04:00
Harald Albers
c564a9ec27 bash completion for docker volume ls -f {driver,name} 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3cf856ce0cfa2d619515ea3f98cf559660e24f1e
Component: engine
 2016-04-08 13:45:44 +02:00
Harald Albers
85a76c64a2 bash completion for --log-opt syslog-format 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 472030e9cc3f3f80824eaa9f32e656f17801ec5b
Component: engine
 2016-04-08 13:19:25 +02:00
Vincent Demeester
8c5a13eca7 Merge pull request #21844 from yongtang/21793-syslog-timestamp-rfc5424-microsecond 
Additional syslog-format option to allow microsecond resolution in syslog timestamp.
Upstream-commit: 6fbc2064369f0fa691c22266abc07f49166fabac
Component: engine
 2016-04-08 11:31:17 +02:00
Vincent Demeester
fc44672a2f Merge pull request #21878 from TrumanLing/fix_typo 
fix typo
Upstream-commit: fb9523442da7da497ee29db63d0ae2591c0cfa1a
Component: engine
 2016-04-08 11:19:52 +02:00
LingFaKe
c71898566b fix typo 
Signed-off-by: Ling FaKe <lingfake@huawei.com>
Upstream-commit: d0344731ef11a5951c86f444ac40e27f2472db01
Component: engine
 2016-04-08 22:08:58 +08:00
Victor Vieux
1946302b86 fix typo in comment 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 76122f95e9173c1182b8dd44e1aa236a045d4e6a
Component: engine
 2016-04-08 00:05:31 -07:00
Yong Tang
6e179f4b7d Additional syslog-format option to allow microsecond resolution in syslog timestamp. 
This fix tries to add an additional syslog-format of `rfc5424micro` which follows
the same as rfc5424 except that it use microsecond resolution for timestamp. The
purpose is to solve the issue raised in #21793 where log events might lose its
ordering if happens on the same second.

The timestamp field in rfc5424 is derived from rfc3339, though the maximium
resolution is limited to "TIME-SECFRAC" which is 6 (microsecond resolution).

The appropriate documentation (`docs/admin/logging/overview.md`) has been updated
to reflect the change in this fix.

This fix adds a unit test to cover the newly introduced format.

This fix fixes #21793.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7581cf96fbe0cddacf246f2982634190ebe455c9
Component: engine
 2016-04-08 05:00:11 +00:00
John Howard
f61a32826f Merge pull request #21872 from Microsoft/sjw/nanoserver-fix 
Fixing nanoserver image load bug.
Upstream-commit: d5ef62f4895206abd4ab2b5e61a49a59d37d1ecf
Component: engine
 2016-04-07 21:24:32 -07:00
Zhang Wei
ab9594eafe Add missing "start" event back for auto-restart container 
When container is automatically restarted based on restart policy,
docker events can't get "start" event but only get "die" event, this is
not consistent with previous behavior. This commit will add "start"
event back.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: fdfaaeb9aa72404bde5207510bf5910893414b5d
Component: engine
 2016-04-08 11:40:32 +08:00
Sebastiaan van Stijn
53e7dea4ac Merge pull request #21874 from Hyzhou/master 
Fix the docker image --no-trunk output format
Upstream-commit: 6ad89f4d2fdf5b0c176479f990f02c3676dc44b0
Component: engine
 2016-04-07 20:37:14 -07:00
John Howard
088a8da7f5 Merge pull request #21774 from Microsoft/jstarks/support_non_base_layered_images 
Windows: support non-base-layered images
Upstream-commit: fdd5b5de6290f351a91b80f4e6634fbb87862776
Component: engine
 2016-04-07 20:13:38 -07:00
Brian Goff
b2fd28f517 Merge pull request #21863 from LK4D4/narrow_interface 
pkg/archive: use more narrow interface for CompressStream
Upstream-commit: 64f10251bd034e1b2bd1c4d5f07ee633b4fcced8
Component: engine
 2016-04-07 22:35:19 -04:00
Lei Jitang
4b530927b7 Fix docker stats missing memory limit 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a0a6d031d76c1bf9d5581a8310b8a2d1df4b7b82
Component: engine
 2016-04-07 22:09:07 -04:00
Brian Goff
30ee59a24a Merge pull request #21867 from calavera/remove_reference_from_api 
Remove reference package dependency from the api.
Upstream-commit: 681b5e0ed45f535d123d997884ce4ffb2907932f
Component: engine
 2016-04-07 21:56:43 -04:00
Brian Goff
fd446e3c8a Merge pull request #21815 from Microsoft/jjh/fixunittest 
Windows: Fix failing unit tests
Upstream-commit: 3e14070c880dc1f3d9ca81c55f84ccebe8d89ad2
Component: engine
 2016-04-07 21:14:42 -04:00
Hyzhou
55523d36c7 Fix the docker image --no-trunk output format 
docker 1.10 change the output format of image id.

Signed-off-by: hyzhou.zhy <hyzhou.zhy@alibaba-inc.com>
Upstream-commit: b83e9df7609e705a85545a8a63db81ef73d85b0e
Component: engine
 2016-04-08 08:59:59 +08:00