12fe27a408
Windows: Added support for memory limit
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-15 17:07:29 -07:00
30bbf184e9
Merge pull request #23392 from Microsoft/RevendorHcsshim
...
Revendor hcsshim to v0.3.2
2016-06-09 11:39:39 -07:00
5bdc833e44
Merge pull request #23413 from vdemeester/client-fix-context-sharing
...
Fix some api/client context sharing/plumbing
2016-06-09 10:15:10 -07:00
075b75fa14
Fix some context sharing/plumbing
...
With cobra switch (and maybe before), some context weren't *plumbed* the
right way, fixing that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-09 17:58:10 +02:00
63a7a59c92
Merge pull request #23408 from absourdnoise/fix-docs-readme-link
...
Fixing man page link in docs/README.md
2016-06-09 15:59:48 +02:00
55e9976316
Fixing man page link
...
Signed-off-by: Andrew Po <absourd.noise@gmail.com>
2016-06-09 16:39:50 +03:00
b8f3cdfaec
Merge pull request #23402 from michael-holzheu/PR-bump-libseccomp-golang
...
Bump seccomp version to enable ppc/s390x seccomp support
2016-06-09 14:15:03 +02:00
266c40087c
Merge pull request #23398 from jfrazelle/23394-butts
...
fix default tmpfs size to prevent breakage
2016-06-09 14:08:58 +02:00
758f9a8ceb
Bump seccomp version to enable ppc/s390x seccomp support
...
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-06-09 05:48:06 -04:00
982c5f199f
fix default tmpfs size to prevent breakage
...
Signed-off-by: Jess Frazelle <me@jessfraz.com>
2016-06-09 00:58:06 -07:00
456551a672
Merge pull request #23380 from Microsoft/jjh/refreshwin2lin
...
Update win2lin scripts to match production
2016-06-09 08:14:14 +02:00
bb1c54bc1f
Revendor hcsshim to v0.3.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-08 17:32:22 -07:00
6717b35503
Merge pull request #23385 from thaJeztah/fix-rpm-manpages
...
fix RPM spec for man8
2016-06-09 01:04:02 +02:00
b47bf3dc69
Merge pull request #23387 from thaJeztah/fix-TestEventsContainerWithMultiNetwork
...
fix TestEventsContainerWithMultiNetwork
2016-06-09 01:03:17 +02:00
5b1060c775
Merge pull request #23354 from riyazdf/notary-delegation-env
...
Add link to notary environment vars from docker trust automation section
2016-06-09 00:09:28 +02:00
e884a515e9
Merge pull request #23334 from WeiZhang555/cobra-stats
...
Migrate stats and events command to cobra
2016-06-08 23:50:46 +02:00
8a22c4166b
Merge pull request #23384 from jannickfahlbusch/fix-typos
...
Fix some typos
2016-06-08 23:46:47 +02:00
7d22eb072c
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 148bcda329
2016-06-08 23:09:20 +02:00
6fd8c96f61
Merge pull request #23344 from pdalpra/timeout-as-time.Duration
...
Timeout as time.duration
2016-06-08 16:37:08 -04:00
70a03951a0
fix RPM spec for man8
...
installation for man-8 was added in 1514b499f0
2016-06-08 22:21:21 +02:00
e3490cdcc0
Fix some typos
...
Signed-off-by: Jannick Fahlbusch <git@jf-projects.de>
2016-06-08 21:59:34 +02:00
3b08711bb7
Merge pull request #23343 from vdemeester/migrate-build-to-cobra
...
Use spf13/cobra for docker build
2016-06-08 11:59:48 -07:00
f8a8222126
Merge pull request #23381 from kolyshkin/docs-add-ploop-plugin
...
docs/extend/plugins.md: add docker-volume-ploop
2016-06-08 20:39:37 +02:00
e3d31d794b
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>
2016-06-08 11:24:56 -07:00
393e97e435
Merge pull request #23002 from Microsoft/jjh/readonly
...
Windows: Support RO volumes 14350+
2016-06-08 11:18:48 -07:00
9ea3f2aca2
Update win2lin scripts to match production
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-06-08 11:08:23 -07:00
9db33b7646
Merge pull request #23377 from vdemeester/carry-pr-23007
...
Carry #23007 : Say something useful during docker load
2016-06-08 13:42:22 -04:00
148bcda329
Merge pull request #23375 from HackToday/fixnetworkmap
...
Fix wrong map usage
2016-06-08 18:19:08 +02:00
9b5e0ea7de
Update docker-load documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-08 17:40:37 +02:00
430950e2d1
Merge pull request #23305 from thaJeztah/fix-network-examples
...
network docs cleanup
2016-06-08 17:32:00 +02:00
6986a3220f
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>
2016-06-08 17:17:05 +02:00
a63e95423a
Merge pull request #23372 from GaretJax/23369-unicode-parse-words
...
Support unicode characters in parseWords
2016-06-08 17:05:02 +02:00
1cac7e6cbd
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>
2016-06-08 14:36:47 +00:00
6284f04a6b
Support unicode characters in parseWords
...
Signed-off-by: Jonathan Stoppani <jonathan.stoppani@divio.com>
2016-06-08 14:05:08 +02:00
a4422e6ebc
Merge pull request #22880 from bfirsh/remote-api-json-errors
...
Return remote API errors as JSON
2016-06-08 11:16:00 +02:00
b29e8ea412
Use time.Duration for container restart/stop timeouts
...
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com>
2016-06-08 08:05:18 +02:00
04cdb8e602
Migrate stats and events command to cobra.
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-06-08 10:39:53 +08:00
d85491ff4b
Merge pull request #21946 from chosenken/add_disk_quota_to_zfs
...
Add support for setting storage size on ZFS containers
2016-06-07 22:18:25 -04:00
88e9fcf65a
Merge pull request #23355 from crosbymichael/bump-containerd-jun7
...
Update containerd to cf554d59dd96e459544748290eb91
2016-06-08 02:14:05 +00:00
322e2a7d05
Return remote API errors as JSON
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-06-07 18:45:27 -07:00
d17b9f3da0
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>
2016-06-07 15:27:23 -07:00
f6ff9acc63
Merge pull request #23327 from dmcgowan/refactor-foreign-layer
...
Refactor foreign sources to describable interfaces
2016-06-08 00:02:23 +02:00
8d174a43ba
Windows: Support RO volumes 14350+
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-06-07 14:55:36 -07:00
13d101d53c
Merge pull request #23333 from yongtang/23211-spf13-cobra-version
...
Use spf13/cobra for docker version
2016-06-07 23:46:01 +02:00
ce96ce9e05
Merge pull request #23311 from WeiZhang555/cobra-rm
...
Migrate rm command to cobra
2016-06-07 17:05:21 -04:00
8d72ff3f5e
Add link to notary environment vars from docker trust automation section
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-06-07 14:03:56 -07:00
08419313ec
Merge pull request #23292 from yongtang/23211-spf13-cobra-images
...
Use spf13/cobra for docker images
2016-06-07 21:56:42 +02:00
55a8bfa0e8
Merge pull request #23278 from yongtang/23211-spf13-cobra-tag
...
Use spf13/cobra for docker tag
2016-06-07 21:55:29 +02:00
9d139e50bc
Merge pull request #23349 from albers/completion-ps-filter-network
...
bash completion for `docker ps --filter network`
2016-06-07 21:54:58 +02:00
337eaab5d1
bash completion for `docker ps --filter network`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-07 12:44:17 -07:00
Darren Stahl
John Howard
Alexander Morozov
Vincent Demeester
Andrew Po
Sebastiaan van Stijn
Michael Holzheu
Jess Frazelle
Sebastiaan van Stijn
Brian Goff
Jannick Fahlbusch
Kirill Kolyshkin
Michael Crosby
John Howard
Doug Davis
Kai Qiang Wu(Kennan)
Jonathan Stoppani
Pierre Dal-Pra
Zhang Wei
Arnaud Porterie
Ben Firshman
Antonio Murdaca
Riyaz Faizullabhoy
Harald Albers