Commit graph

23611 commits

Author SHA1 Message Date
Vincent Demeester
4ac59a1282 Merge pull request #21905 from npcode/docs-authorization-RequestUri
Fix errata; s/RequestUri/ReqestURI/
2016-04-09 18:51:20 +02:00
Vincent Demeester
417fce0b77 Merge pull request #21906 from allencloud/fix-typos-pkg
fix typos in pkg
2016-04-09 18:50:42 +02:00
allencloud
aef02273d9 fix typos in pkg
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-04-09 21:18:15 +08:00
Vincent Demeester
a01f4dc229 Merge pull request #21853 from coolljt0725/fix_stats
Fix docker stats missing mem limit
2016-04-09 13:46:58 +02:00
Yi EungJun
94985b4bff Fix errata; s/RequestUri/ReqestURI/
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-04-09 19:19:35 +09:00
John Howard
f2ed337ac9 Merge pull request #21740 from mindlapse/fixErrorMsg
Improved message when pushing a non-existant image
2016-04-08 20:53:25 -07:00
John Howard
fec6cd2eb9 Merge pull request #20525 from Microsoft/sjw/update-graphdriver-create
Adding readOnly parameter to graphdriver Create method
2016-04-08 20:44:03 -07:00
Sebastiaan van Stijn
fd67c8b203 Merge pull request #21868 from anusha-ragunathan/not-exp-requirement
Add non-experimental daemon as a test requirement.
2016-04-08 17:55:16 -07:00
Sebastiaan van Stijn
eaa1e8a8c4 Merge pull request #21839 from WeiZhang555/add-start-event
Add missing "start" event back for auto-restart container
2016-04-08 17:52:22 -07:00
Sebastiaan van Stijn
3bac588335 Merge pull request #21900 from vieux/type
fix typo in comment
2016-04-08 17:46:41 -07:00
David Calavera
f62b26571a Merge pull request #21894 from Microsoft/sjw/nanoserver-fix
Fixing warning to correctly output error string.
2016-04-08 16:43:07 -07:00
Stefan J. Wernli
3c220cfcba Fixing warning to correctly output error string.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-04-08 15:04:04 -07:00
David Calavera
a3007ceccc Merge pull request #21773 from yongtang/21765-stats-HumanSize-to-BytesSize
Change HumanSize to BytesSize for memory output in `docker stats`.
2016-04-08 14:56:22 -07:00
Sebastiaan van Stijn
f832183e33 Merge pull request #21884 from albers/completion-volume-ls-filter
bash completion for `docker volume ls -f {driver,name}`
2016-04-08 14:33:09 -07:00
Yong Tang
0e3846e280 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>
2016-04-08 20:01:50 +00:00
David Calavera
e626011bfb Merge pull request #21760 from hqhq/hq_minimum_reservation
Add minimum limit for memory reservation
2016-04-08 07:58:28 -07:00
David Calavera
1e9115ced4 Merge pull request #21883 from albers/completion-syslog-format
bash completion for `--log-opt syslog-format`
2016-04-08 07:54:53 -07:00
Brian Goff
7f865e4953 Merge pull request #21777 from Microsoft/jjh/killTP4
Windows: So long TP4, so long...
2016-04-08 09:33:23 -04:00
Harald Albers
3cf856ce0c bash completion for docker volume ls -f {driver,name}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-04-08 13:45:44 +02:00
Harald Albers
472030e9cc bash completion for --log-opt syslog-format
Signed-off-by: Harald Albers <github@albersweb.de>
2016-04-08 13:19:25 +02:00
Vincent Demeester
6fbc206436 Merge pull request #21844 from yongtang/21793-syslog-timestamp-rfc5424-microsecond
Additional syslog-format option to allow microsecond resolution in syslog timestamp.
2016-04-08 11:31:17 +02:00
Vincent Demeester
fb9523442d Merge pull request #21878 from TrumanLing/fix_typo
fix typo
2016-04-08 11:19:52 +02:00
LingFaKe
d0344731ef fix typo
Signed-off-by: Ling FaKe <lingfake@huawei.com>
2016-04-08 22:08:58 +08:00
Victor Vieux
76122f95e9 fix typo in comment
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-08 00:05:31 -07:00
Yong Tang
7581cf96fb 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>
2016-04-08 05:00:11 +00:00
John Howard
d5ef62f489 Merge pull request #21872 from Microsoft/sjw/nanoserver-fix
Fixing nanoserver image load bug.
2016-04-07 21:24:32 -07:00
Zhang Wei
fdfaaeb9aa 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>
2016-04-08 11:40:32 +08:00
Sebastiaan van Stijn
6ad89f4d2f Merge pull request #21874 from Hyzhou/master
Fix the docker image --no-trunk output format
2016-04-07 20:37:14 -07:00
John Howard
fdd5b5de62 Merge pull request #21774 from Microsoft/jstarks/support_non_base_layered_images
Windows: support non-base-layered images
2016-04-07 20:13:38 -07:00
Brian Goff
64f10251bd Merge pull request #21863 from LK4D4/narrow_interface
pkg/archive: use more narrow interface for CompressStream
2016-04-07 22:35:19 -04:00
Lei Jitang
a0a6d031d7 Fix docker stats missing memory limit
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-04-07 22:09:07 -04:00
Brian Goff
681b5e0ed4 Merge pull request #21867 from calavera/remove_reference_from_api
Remove reference package dependency from the api.
2016-04-07 21:56:43 -04:00
Brian Goff
3e14070c88 Merge pull request #21815 from Microsoft/jjh/fixunittest
Windows: Fix failing unit tests
2016-04-07 21:14:42 -04:00
Hyzhou
b83e9df760 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>
2016-04-08 08:59:59 +08:00
Brian Goff
0c4f28e51a Merge pull request #21871 from tonistiigi/fix-restartpolicy-on-restart
Fix restart monitor stopping on manual restart
2016-04-07 20:56:33 -04:00
John Starks
cf7944bf6f Windows: Support ApplyDiff on a base layer
This adds support to the Windows graph driver for ApplyDiff on a base
layer. It also adds support for hard links, which are needed because the
Windows base layers double in size without hard link support.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-07 17:52:28 -07:00
John Starks
9b486999f2 Windows: revendor Microsoft/go-winio and Microsoft/hcsshim
These changes add support for importing base layers and change the tar
metadata for Windows layers to better match the intent of the tar format.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-07 17:52:27 -07:00
John Starks
d45a26d7e2 Windows: Support non-base-layered images
Previously, Windows only supported running with a OS-managed base image.
With this change, Windows supports normal, Linux-like layered images, too.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-07 17:52:26 -07:00
Sebastiaan van Stijn
fc352287c1 Merge pull request #21816 from estesp/case-of-the-missing-else
Don't perform external setkey when net==host
2016-04-07 17:01:30 -07:00
Stefan J. Wernli
a22092b136 Fixing nanoserver image load bug.
Fixes an issue that prevents nano server images from loading properly. Also updates logic for custom image loading to avoid preventing daemon start because an image failed to load.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-04-07 16:44:51 -07:00
Tonis Tiigi
20390f65c4 Fix restart monitor stopping on manual restart
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-07 16:12:05 -07:00
David Calavera
47afe6bd0a Remove reference package dependency from the api.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-04-07 15:01:23 -07:00
Anusha Ragunathan
c7076d2670 Add non-experimental daemon as a test requirement.
For test that should be exclusively run only in regular daemon builds
and not in the experimental version, add a requirement.

Verified using TestCleanupMountsAfterDaemonKill.
- On regular daemon, the test ran.
- On experimental daemon, the test skipped.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-04-07 14:46:32 -07:00
Sebastiaan van Stijn
14015eedb1 Merge pull request #21750 from LK4D4/flaky_format_test
integration-cli: try to make TestEventsTimestampFormats less flaky
2016-04-07 13:42:17 -07:00
Vincent Demeester
14aa019d2d Merge pull request #21859 from tonistiigi/vendor-net-fork
vendor: patch template init in trace pkg for performance
2016-04-07 22:39:23 +02:00
Alexander Morozov
9b2c3aa894 pkg/archive: use more narrow interface for CompressStream
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-04-07 13:21:05 -07:00
Vincent Demeester
07f5804899 Merge pull request #21806 from Microsoft/RemoveSymlinkTests
Stop running symlink-volume tests on Windows
2016-04-07 22:03:44 +02:00
Tonis Tiigi
07fe6947a4 vendor: patch template init in trace pkg for performance
Temporarily include a fork of golang/net package
that includes a performance patch. Measured performance
gain is ~60ms for every `docker run` command.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-07 11:02:14 -07:00
Jess Frazelle
1fbdd354c2 Merge pull request #21855 from vdemeester/makefile-typo
Fixing a typo in Makefile
2016-04-07 16:41:25 +00:00
Tibor Vass
e82830ecde Merge pull request #21628 from clnperez/systemd-tasksmax-workaround
Build-deb hack for systemd tasksmax
2016-04-07 12:30:45 -04:00