Tibor Vass
c7cf245053
Merge pull request #21751 from tonistiigi/runc-maskedpaths
...
Define readonly/mask paths in spec
2016-04-06 12:16:28 -04:00
John Howard
f3da0c9055
Merge pull request #21669 from msabansal/expose
...
Enabling expose support for Windows TP5
2016-04-06 07:52:07 -07:00
Brian Goff
e24673def2
Merge pull request #21795 from mountkin/refactor-init
...
refactor the init function in docker_utils.go
2016-04-06 10:39:55 -04:00
Brian Goff
891023617a
Merge pull request #21779 from Microsoft/jjh/dockerfile
...
Windows: Dockerfile for TP5
2016-04-06 10:23:53 -04:00
Brian Goff
c760ea3d93
Merge pull request #21785 from Microsoft/jjh/nodeletenat
...
Windows: integration-cli don't delete nat
2016-04-06 10:20:58 -04:00
Shijiang Wei
50d5d55f56
refactor the init function in docker_utils.go
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-04-06 20:16:00 +08:00
Lei Jitang
bb9b17314d
Merge pull request #21789 from npcode/docs-plugins-authorization-null
...
Use 'null' instead of 'nil' for json
2016-04-06 15:29:40 +08:00
Yi EungJun
2f69d7689d
Use 'null' instead of 'nil' for json
...
When describe json response, 'null' is better than 'nil' which is not in
json specification.
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-04-06 16:13:48 +09:00
Aaron Lehmann
81b01b44c6
Merge pull request #21767 from allencloud/fix-typos
...
fix typos
2016-04-05 20:32:14 -07:00
allencloud
34700cc1f3
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-04-06 10:35:01 +08:00
John Howard
d6ab2ad36d
Windows: integration-cli don't delete nat
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-05 19:29:43 -07:00
John Howard
83809de7d4
Windows: Dockerfile for TP5
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-05 19:08:20 -07:00
John Howard
fc9912fd00
Merge pull request #21272 from Microsoft/jstarks/manifest_updates
...
Add os_version and os_features to Image
2016-04-05 16:16:25 -07:00
Alexander Morozov
806a8e22b9
Merge pull request #21755 from cpuguy83/bytespipe_allocs
...
Improve performance/reduce allocs of bytespipe
2016-04-05 14:43:57 -07:00
Brian Goff
9a25b1d942
Improve performance/reduce allocs of bytespipe
...
Creates a `fixedBuffer` type that is used to encapsulate functionality
for reading/writing from the underlying byte slices.
Uses lazily-loaded set of sync.Pools for storing buffers that are no
longer needed so they can be re-used.
```
benchmark old ns/op new ns/op delta
BenchmarkBytesPipeWrite-8 138469 48985 -64.62%
BenchmarkBytesPipeRead-8 130922 56601 -56.77%
benchmark old allocs new allocs delta
BenchmarkBytesPipeWrite-8 18 8 -55.56%
BenchmarkBytesPipeRead-8 0 0 +0.00%
benchmark old bytes new bytes delta
BenchmarkBytesPipeWrite-8 66903 1649 -97.54%
BenchmarkBytesPipeRead-8 0 1 +Inf%
```
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-05 13:06:04 -04:00
Vincent Demeester
83bc8d2b8c
Merge pull request #21763 from larsbutler/names-generator-comment-typo-fix
...
Fix spelling error in names-generator.go
2016-04-05 13:58:14 +02:00
Lars Butler
0cad90911f
Fix spelling error in names-generator.go
...
Signed-off-by: Lars Butler <Lars.Butler@gmail.com>
2016-04-05 12:34:52 +02:00
Vincent Demeester
8d31b0f051
Merge pull request #21719 from senk/21710-fix-client-help-text
...
Fixing help text of "docker network --help" to be consistent
2016-04-05 09:38:35 +02:00
Vincent Demeester
deedb063b3
Merge pull request #21713 from sunyuan3/kernel-memory20160401
...
Add pause status check for --kernel-memory
2016-04-05 09:37:39 +02:00
Tonis Tiigi
3f81b49352
Define readonly/mask paths in spec
...
This vendors in new spec/runc that supports
setting readonly and masked paths in the
configuration. Using this allows us to make an
exception for `—-privileged`.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-04 18:55:55 -07:00
Michael Crosby
d20933c461
Merge pull request #21722 from cyphar/make-listeners-new-pkg
...
move docker/listeners to pkg/listeners
2016-04-04 13:28:50 -07:00
John Starks
194eaa5c0f
Add os_version and os_features to Image
...
These fields are needed to specify the exact version of Windows that an
image can run on. They may be useful for other platforms in the future.
This also changes image.store.Create to validate that the loaded image is
supported on the current machine. This change affects Linux as well, since
it now validates the architecture and OS fields.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-04 13:14:57 -07:00
Alexander Morozov
35268ee824
Merge pull request #21730 from thaJeztah/improve-udev-error
...
Improve udev unsupported error message
2016-04-04 09:30:23 -07:00
Tibor Vass
0ed27f686f
Merge pull request #21745 from kencochrane/fix_release_sh_typo
...
Fixed a typo in release.sh
2016-04-04 09:45:36 -04:00
Ken Cochrane
e7d54a4133
Fixed a typo in release.sh
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-04 09:27:14 -04:00
Sebastiaan van Stijn
b8f38747e6
Improve udev unsupported error message
...
Show a different message if a dynamic binary
is running, but doesn't have udev sync support.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-01 13:31:44 -07:00
Michael Crosby
8eb8a1d6b8
Merge pull request #21709 from crosbymichael/clear-notify-socket
...
Clear nofity socket from containerd env
2016-04-01 11:15:05 -07:00
Michael Crosby
365401703d
Clear nofity socket from containerd env
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-01 11:02:14 -07:00
Aleksa Sarai
619bf56778
pkg: listeners: clean up to act like a library
...
Now that listeners is no longer an internal of the client, make it less
Docker-specific (despite there still being some open questions as how to
deal with some of the warnings that listeners has to emit). We should
move as much of the Docker-specific stuff (especially the port
allocation) to docker/ where it belongs (or maybe pass a check function).
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-04-02 01:09:29 +11:00
Aleksa Sarai
e3a8c8388f
pkg: listeners: separate out the listeners package
...
This code will be used in containerd and is quite useful in general to
people who want a nice way of creating listeners from proto://address
arguments (even supporting socket activation). Separate it out from
docker/ so people can use it much more easily.
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-04-02 01:09:29 +11:00
Robin Naundorf
737219bbdb
Fixing help text of "docker network --help" to be consistend
...
Changed from hashmap to multidimensional array as in "docker volume --help"
closes #21710
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
2016-04-01 14:14:09 +02:00
Yuan Sun
16dfb38fb8
Add pause status check for --kernel-memory
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2016-04-01 10:32:46 +08:00
Sebastiaan van Stijn
4a7bd7eaef
Merge pull request #20410 from tkopczynski/20236-info-insecure-registry
...
Add insecure registries to docker info
2016-03-31 16:39:25 -07:00
Tibor Vass
3acb466f2d
Merge pull request #21695 from kencochrane/change_tgz_to_zip_on_windows
...
Change the windows bundle from a .tgz to a .zip file
2016-03-31 18:40:37 -04:00
Alexander Morozov
ad4750cf3a
Merge pull request #21694 from LK4D4/remove_unused_pkg
...
pkg: cleanup some unused code
2016-03-31 15:06:35 -07:00
Sebastiaan van Stijn
42494720c2
Merge pull request #21687 from allencloud/fix-typos
...
fix typos
2016-03-31 14:18:31 -07:00
Aaron Lehmann
dd94c88376
Merge pull request #21698 from tonistiigi/fix-flaky-websocket-attach-test
...
Fix flaky TestGetContainersAttachWebsocket
2016-03-31 14:03:58 -07:00
David Calavera
6b4f7e6b7f
Merge pull request #21696 from LK4D4/cleanup_unused_daemon
...
daemon: remove some unused code
2016-03-31 13:55:27 -07:00
Tibor Vass
f19f91d0da
Merge pull request #21693 from cyli/fix-trusted-build-and-run
...
Request pull credentials when using trusted reference
2016-03-31 16:35:06 -04:00
David Calavera
3e03fc913a
Merge pull request #21692 from tonistiigi/fix-events-timer
...
Fix race with event timer stopping early
2016-03-31 13:11:43 -07:00
Ken Cochrane
fda99a7e16
Change the windows .tgz to a .zip file
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-31 15:56:13 -04:00
David Calavera
00031c15b5
Merge pull request #21679 from tonistiigi/no-pivot-root
...
Bring back support for DOCKER_RAMDISK
2016-03-31 12:40:57 -07:00
Alexander Morozov
07b568cb53
pkg: cleanup some unused code
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-31 11:39:59 -07:00
Tonis Tiigi
85354fb77c
Fix flaky TestGetContainersAttachWebsocket
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-31 11:31:48 -07:00
Alexander Morozov
b9966f3a81
daemon: remove some unused code
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-31 11:24:12 -07:00
cyli
df9cc3d922
Request pull credentials when using trusted reference
...
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-03-31 10:56:19 -07:00
Alexander Morozov
2d18ed7e4b
Merge pull request #21356 from cpuguy83/stdcopy_allocs
...
Optimizations for StdWriter
2016-03-31 10:54:45 -07:00
Tonis Tiigi
8a4225cd5a
Bring back support for DOCKER_RAMDISK
...
Fixes #21631
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-31 10:29:32 -07:00
Tonis Tiigi
b38cee9f9c
Fix race between with event timer stopping early
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-31 09:49:07 -07:00
David Calavera
61ca308676
Merge pull request #21685 from runcom/int-fix-tiny
...
integration-cli: add info to fatal log
2016-03-31 09:44:05 -07:00