6942781ead
Add a benchmark for logger.Copier
...
Add a benchmark for measuring how the logger.Copier implementation
handles logged lines of sizes ranging up from 64 bytes to 256KB.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com >
Upstream-commit: af439c7a8da878450d0e5583935a1c4208fa92ad
Component: engine
2016-06-09 09:47:13 -04:00
9e8cade78a
Merge pull request #23402 from michael-holzheu/PR-bump-libseccomp-golang
...
Bump seccomp version to enable ppc/s390x seccomp support
Upstream-commit: b8f3cdfaec28ed4113b30923452a9842312ba70f
Component: engine
2016-06-09 14:15:03 +02:00
83ade3a267
Merge pull request #23398 from jfrazelle/23394-butts
...
fix default tmpfs size to prevent breakage
Upstream-commit: 266c40087cbdd80b93e435284264db5f881a03e1
Component: engine
2016-06-09 14:08:58 +02:00
fd09c4f818
Bump seccomp version to enable ppc/s390x seccomp support
...
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: 758f9a8cebbc3f6a0f07cd66146c726452b4207d
Component: engine
2016-06-09 05:48:06 -04:00
19a918ce43
fix default tmpfs size to prevent breakage
...
Signed-off-by: Jess Frazelle <me@jessfraz.com >
Upstream-commit: 982c5f199fe548ecafd53ab72e7984a6ce07ba8f
Component: engine
2016-06-09 00:58:06 -07:00
7b699065ec
Merge pull request #23380 from Microsoft/jjh/refreshwin2lin
...
Update win2lin scripts to match production
Upstream-commit: 456551a672db7285dfdba9927c1acb8d2ab07a6b
Component: engine
2016-06-09 08:14:14 +02:00
0cfb313091
Merge pull request #23385 from thaJeztah/fix-rpm-manpages
...
fix RPM spec for man8
Upstream-commit: 6717b355034e81659cd8144590eaa7ac8c573fba
Component: engine
2016-06-09 01:04:02 +02:00
5d76988d40
Merge pull request #23387 from thaJeztah/fix-TestEventsContainerWithMultiNetwork
...
fix TestEventsContainerWithMultiNetwork
Upstream-commit: b47bf3dc696615308d021b6ef417a9147d7b065c
Component: engine
2016-06-09 01:03:17 +02:00
c7bd96a413
Merge pull request #23354 from riyazdf/notary-delegation-env
...
Add link to notary environment vars from docker trust automation section
Upstream-commit: 5b1060c7758aa6bfd2210515a3e24fb287322ed9
Component: engine
2016-06-09 00:09:28 +02:00
6828e7721d
Merge pull request #23334 from WeiZhang555/cobra-stats
...
Migrate stats and events command to cobra
Upstream-commit: e884a515e96201d4027a6c9c1b4fa884fc2d21a3
Component: engine
2016-06-08 23:50:46 +02:00
abc5e5e918
Merge pull request #23384 from jannickfahlbusch/fix-typos
...
Fix some typos
Upstream-commit: 8a22c4166b3f82f4ae447a89541e8b691a3bddda
Component: engine
2016-06-08 23:46:47 +02:00
7eea5a2dd4
fix TestEventsContainerWithMultiNetwork
...
the order in which disconnect takes place is undetermined,
so don't check for the full name
this test was passing due to a previous bug, that
always returned the same network-name.
this bug was recently fixed in 148bcda3292563df8e433a3d7987810cd5702dec
(pull request 23375), exposing this test to be
flaky.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7d22eb072cd277048e678d6244e5fb395b34f1ff
Component: engine
2016-06-08 23:09:20 +02:00
ecac3fcd79
Merge pull request #23344 from pdalpra/timeout-as-time.Duration
...
Timeout as time.duration
Upstream-commit: 6fd8c96f6164fa70170a2400f8fa092de9507cf9
Component: engine
2016-06-08 16:37:08 -04:00
2c68dc49b6
fix RPM spec for man8
...
installation for man-8 was added in 1514b499f04e317d6bc81bb2d46a6623db422763
(pull-request 23236), but had a typo in a path,
causing generation of the RPM's to fail.
This fixes the path
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 70a03951a037c2c415d84fc65eff989151c1dfc4
Component: engine
2016-06-08 22:21:21 +02:00
79ea898035
Fix some typos
...
Signed-off-by: Jannick Fahlbusch <git@jf-projects.de >
Upstream-commit: e3490cdcc0e2b1e4c4da125626430016a3048128
Component: engine
2016-06-08 21:59:34 +02:00
6c2f2ddb74
Merge pull request #23343 from vdemeester/migrate-build-to-cobra
...
Use spf13/cobra for docker build
Upstream-commit: 3b08711bb75e30d850665312413a60f51114202f
Component: engine
2016-06-08 11:59:48 -07:00
f6287067bc
Merge pull request #23381 from kolyshkin/docs-add-ploop-plugin
...
docs/extend/plugins.md: add docker-volume-ploop
Upstream-commit: f8a8222126806391f78a87cf327dd69353488c3c
Component: engine
2016-06-08 20:39:37 +02:00
9194f25b8a
docs/extend/plugins.md: add docker-volume-ploop
...
Added docker-volume-ploop driver to the list of available volume plugins.
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
Upstream-commit: e3d31d794b64d93174e17dd98249033e623adbe6
Component: engine
2016-06-08 11:24:56 -07:00
74d1f25f8f
Merge pull request #23002 from Microsoft/jjh/readonly
...
Windows: Support RO volumes 14350+
Upstream-commit: 393e97e435e7c1629934d8042d1fb8e5bb7d61f9
Component: engine
2016-06-08 11:18:48 -07:00
ef59715b3a
Update win2lin scripts to match production
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9ea3f2aca2ce3b12d42e72290e404592209ee652
Component: engine
2016-06-08 11:08:23 -07:00
41181cb2ee
Merge pull request #23377 from vdemeester/carry-pr-23007
...
Carry #23007 : Say something useful during docker load
Upstream-commit: 9db33b7646854ed994b74d0e71bced087e617291
Component: engine
2016-06-08 13:42:22 -04:00
a9c87bb7fb
Merge pull request #23375 from HackToday/fixnetworkmap
...
Fix wrong map usage
Upstream-commit: 148bcda3292563df8e433a3d7987810cd5702dec
Component: engine
2016-06-08 18:19:08 +02:00
5988d92124
Update docker-load documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9b5e0ea7dedac3c1cbbaf6770aa6834c8e7b7774
Component: engine
2016-06-08 17:40:37 +02:00
1f1966583b
Merge pull request #23305 from thaJeztah/fix-network-examples
...
network docs cleanup
Upstream-commit: 430950e2d17c25b5df65d61a53f50528510509ac
Component: engine
2016-06-08 17:32:00 +02:00
a3be33ddb5
Say something useful during docker load
...
During a `docker load` there are times when nothing is printed
to the screen, leaving the user with no idea whether something happened.
When something *is* printed, often its just something like:
```
1834950e52ce: Loading layer 1.311 MB/1.311 MB
5f70bf18a086: Loading layer 1.024 kB/1.024 kB
```
which isn't necessarily the same as the image IDs.
This PR will either show:
- all of the tags for the image, or
- all of the image IDs if there are no tags
Sample output:
```
$ docker load -i busybox.tar
Loaded image: busybox:latest
$ docker load -i a.tar
Loaded image ID: sha256:47bcc53f74dc94b1920f0b34f6036096526296767650f223433fe65c35f149eb
```
IOW, show the human-friendly stuff first and then only if there are no tags
default back to the image IDs, so they have something to work with.
For me this this is needed because I have lots of images and after a
recent `docker load` I had no idea what image I just imported and had a
hard time figuring it out. This should fix that by telling the user
which images they just imported.
I'll add tests once there's agreement that we want this change.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6986a3220fe59146eeddeaa865561472abc7baeb
Component: engine
2016-06-08 17:17:05 +02:00
b9baa8d000
Merge pull request #23372 from GaretJax/23369-unicode-parse-words
...
Support unicode characters in parseWords
Upstream-commit: a63e95423a7e33c87b4ad0c10e4f158d4777c469
Component: engine
2016-06-08 17:05:02 +02:00
9eb8ea5219
Fix wrong map usage
...
As map reference, if all networks use same, it could cause strange
results.
Closes : #23304
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 1cac7e6cbd3d1501d0fc29fc55b7ada981974998
Component: engine
2016-06-08 14:36:47 +00:00
1a51605407
Support unicode characters in parseWords
...
Signed-off-by: Jonathan Stoppani <jonathan.stoppani@divio.com >
Upstream-commit: 6284f04a6b3a9b8127dc166ff84b102c8ad411ce
Component: engine
2016-06-08 14:05:08 +02:00
4a159b3745
Merge pull request #22880 from bfirsh/remote-api-json-errors
...
Return remote API errors as JSON
Upstream-commit: a4422e6ebc57c2c1082bc23a9906e948acbb0da7
Component: engine
2016-06-08 11:16:00 +02:00
2193b7f2c7
Use time.Duration for container restart/stop timeouts
...
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com >
Upstream-commit: b29e8ea412534a857d76bc716b79c7483e347f3a
Component: engine
2016-06-08 08:05:18 +02:00
81dc24449c
Migrate stats and events command to cobra.
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 04cdb8e6025d9c0eac0462f3ad3f1ab33204e615
Component: engine
2016-06-08 10:39:53 +08:00
5b4a1181e1
Merge pull request #21946 from chosenken/add_disk_quota_to_zfs
...
Add support for setting storage size on ZFS containers
Upstream-commit: d85491ff4bd300b159425dcad41764f454f43ceb
Component: engine
2016-06-07 22:18:25 -04:00
a1a86f8430
Merge pull request #23355 from crosbymichael/bump-containerd-jun7
...
Update containerd to cf554d59dd96e459544748290eb91
Upstream-commit: 88e9fcf65a6868e8761206f2313b2c701b6094fe
Component: engine
2016-06-08 02:14:05 +00:00
ecda48bde7
Return remote API errors as JSON
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 322e2a7d059a81617b593cf6ece2cfd9f6d4ea03
Component: engine
2016-06-07 18:45:27 -07:00
87fa5c341b
Update containerd to cf554d59dd96e459544748290eb91
...
This bumps containerd to cf554d59dd96e459544748290eb9167f4bcde509 and
includes various fixes and updates the grpc package and types generated
for use.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: d17b9f3da064f4c7e70867be5e64d06b127df301
Component: engine
2016-06-07 15:27:23 -07:00
9504e2f68b
Merge pull request #23327 from dmcgowan/refactor-foreign-layer
...
Refactor foreign sources to describable interfaces
Upstream-commit: f6ff9acc63a0e8203a36e2e357059089923c2a49
Component: engine
2016-06-08 00:02:23 +02:00
9ca189a13d
Windows: Support RO volumes 14350+
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8d174a43babd19e8c1166338b5aa5f1128914a96
Component: engine
2016-06-07 14:55:36 -07:00
0e982325b5
Merge pull request #23333 from yongtang/23211-spf13-cobra-version
...
Use spf13/cobra for docker version
Upstream-commit: 13d101d53ce820d920accd429528374b41bfab4e
Component: engine
2016-06-07 23:46:01 +02:00
65f4a3fb13
Merge pull request #23311 from WeiZhang555/cobra-rm
...
Migrate rm command to cobra
Upstream-commit: ce96ce9e05d9b312b5454237680abadc7aa51092
Component: engine
2016-06-07 17:05:21 -04:00
3e62c84c55
Add link to notary environment vars from docker trust automation section
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 8d72ff3f5e5d3a3a0fb3645ef41ad72713c8298b
Component: engine
2016-06-07 14:03:56 -07:00
41742b0589
Merge pull request #23292 from yongtang/23211-spf13-cobra-images
...
Use spf13/cobra for docker images
Upstream-commit: 08419313ec51b4e9c7db9e12c01cc6eea6cb8f16
Component: engine
2016-06-07 21:56:42 +02:00
819862b983
Merge pull request #23278 from yongtang/23211-spf13-cobra-tag
...
Use spf13/cobra for docker tag
Upstream-commit: 55a8bfa0e863c6399021ac4bf0bb7ca130debe16
Component: engine
2016-06-07 21:55:29 +02:00
d90920d0d6
Merge pull request #23349 from albers/completion-ps-filter-network
...
bash completion for `docker ps --filter network`
Upstream-commit: 9d139e50bc967aa4573608c5f38189bf3933043f
Component: engine
2016-06-07 21:54:58 +02:00
0429c63978
bash completion for docker ps --filter network
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 337eaab5d1bf024dc3299e6b70a575623886e063
Component: engine
2016-06-07 12:44:17 -07:00
fbb8bd9e59
Merge pull request #23338 from vdemeester/23253-fix-create-run
...
Fix create command flags
Upstream-commit: 8cd6977f98f4f51ee110a9795d1d93b9ec4b166c
Component: engine
2016-06-07 10:46:45 -07:00
67251cd308
Merge pull request #23300 from thaJeztah/carry-22894-ps_filter_network
...
[carry 22894] Adding network filter to docker ps command
Upstream-commit: 06a204c314814c8d022a03ed187a11d8b26062c6
Component: engine
2016-06-07 19:18:51 +02:00
e336aa95df
Merge pull request #23328 from swernli/servicingFix
...
Fix postRunProcessing behavior during docker build
Upstream-commit: cc03a422aaa976568dcb423ebb518b0c40e9e66a
Component: engine
2016-06-07 09:49:28 -07:00
5b8c5d757b
Bump engine-api to 8c2141e14bb9e7540938d155976b3ef0661e4814
...
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com >
Upstream-commit: 66234eaf9bd78ccad44db4a199fa865334e7b418
Component: engine
2016-06-07 18:18:37 +02:00
216073fd2b
Migrate docker build to cobra
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 60f447b655c960a48fa23e9eb86cc3bce4aeec37
Component: engine
2016-06-07 18:15:44 +02:00
298b0e2df9
Use spf13/cobra for docker tag
...
This fix is part of the effort to convert commands to spf13/cobra #23211 .
Thif fix coverted command `docker tag` to use spf13/cobra
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ba7324ffcb23ba314fbab335a816004c4af7f3f3
Component: engine
2016-06-07 08:12:49 -07:00
