Commit Graph

23484 Commits

Author SHA1 Message Date
0dfaed7e71 do not trim one char from {{.Names}} each time it is used in --format
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 68ade49adab15429168903f5600ab64ce7f7c8c5
Component: engine
2016-04-06 11:04:13 -07:00
5c35f01162 Merge pull request #21272 from Microsoft/jstarks/manifest_updates
Add os_version and os_features to Image
Upstream-commit: fc9912fd00f5e12a6f0904f3c758275724ba3318
Component: engine
2016-04-05 16:16:25 -07:00
9344bce56a Merge pull request #21755 from cpuguy83/bytespipe_allocs
Improve performance/reduce allocs of bytespipe
Upstream-commit: 806a8e22b96900bc1db5541d316c1cd91c493bea
Component: engine
2016-04-05 14:43:57 -07:00
933477cfba 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>
Upstream-commit: 9a25b1d942da88439ec04797ff6f1c33c3b5562d
Component: engine
2016-04-05 13:06:04 -04:00
a581305764 Merge pull request #21763 from larsbutler/names-generator-comment-typo-fix
Fix spelling error in names-generator.go
Upstream-commit: 83bc8d2b8c0afcf339cd24e19a472db8aa3514e5
Component: engine
2016-04-05 13:58:14 +02:00
a1bd3ee5e1 Fix spelling error in names-generator.go
Signed-off-by: Lars Butler <Lars.Butler@gmail.com>
Upstream-commit: 0cad90911f8b9fab9b9acc940b5759ee1939306e
Component: engine
2016-04-05 12:34:52 +02:00
f1abea2d9e Merge pull request #21719 from senk/21710-fix-client-help-text
Fixing help text of "docker network --help" to be consistent
Upstream-commit: 8d31b0f0515a800d9af29783ff3aa601196cf55c
Component: engine
2016-04-05 09:38:35 +02:00
d14dcb5f72 Merge pull request #21713 from sunyuan3/kernel-memory20160401
Add pause status check for --kernel-memory
Upstream-commit: deedb063b3a451621e10eefaa78ded4413508051
Component: engine
2016-04-05 09:37:39 +02:00
fe1de38f90 Merge pull request #21722 from cyphar/make-listeners-new-pkg
move docker/listeners to pkg/listeners
Upstream-commit: d20933c46159d93ee532ebb229d990fa20b1009c
Component: engine
2016-04-04 13:28:50 -07:00
4815437b5f 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>
Upstream-commit: 194eaa5c0f843257e66b68bd735786308a9d93b2
Component: engine
2016-04-04 13:14:57 -07:00
52fd3a7265 Merge pull request #21730 from thaJeztah/improve-udev-error
Improve udev unsupported error message
Upstream-commit: 35268ee82448be77fa31b145f4bff5fc6d1c72f4
Component: engine
2016-04-04 09:30:23 -07:00
29424df5fb Merge pull request #21745 from kencochrane/fix_release_sh_typo
Fixed a typo in release.sh
Upstream-commit: 0ed27f686f4a7d441b21bf13a98555e1326e0f74
Component: engine
2016-04-04 09:45:36 -04:00
f53ac495f0 Fixed a typo in release.sh
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: e7d54a4133a17c480f143530580f5734f835c5fe
Component: engine
2016-04-04 09:27:14 -04:00
9b4fb715c9 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>
Upstream-commit: b8f38747e60eb76e19f08129ab27cb808d21c22a
Component: engine
2016-04-01 13:31:44 -07:00
02feeb1d94 Merge pull request #21709 from crosbymichael/clear-notify-socket
Clear nofity socket from containerd env
Upstream-commit: 8eb8a1d6b8f89941d0d5db5b59cd6f912d7426db
Component: engine
2016-04-01 11:15:05 -07:00
8f70026df5 Clear nofity socket from containerd env
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 365401703d382861e86072d2813c2eacae56000f
Component: engine
2016-04-01 11:02:14 -07:00
afcd43b3c8 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>
Upstream-commit: 619bf56778c55813c7c9dc81052ee4a277bfd22a
Component: engine
2016-04-02 01:09:29 +11:00
7a120b5566 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>
Upstream-commit: e3a8c8388f8c6f1f67204cdd16b7b685fadda6c3
Component: engine
2016-04-02 01:09:29 +11:00
92dc3a4465 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>
Upstream-commit: 737219bbdbd5c18a2f581c73ac740ea44266b82b
Component: engine
2016-04-01 14:14:09 +02:00
377af3f678 Add pause status check for --kernel-memory
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 16dfb38fb89e4c57c53c54d3559b9fb388e367d4
Component: engine
2016-04-01 10:32:46 +08:00
0d08181d47 Merge pull request #20410 from tkopczynski/20236-info-insecure-registry
Add insecure registries to docker info
Upstream-commit: 4a7bd7eaef0038b006cf23adface84081e5aab3b
Component: engine
2016-03-31 16:39:25 -07:00
dd687168c2 Merge pull request #21695 from kencochrane/change_tgz_to_zip_on_windows
Change the windows bundle from a .tgz to a .zip file
Upstream-commit: 3acb466f2d28ffd4bd0567778d9798460d386e5a
Component: engine
2016-03-31 18:40:37 -04:00
b3c7f3a3f2 Merge pull request #21694 from LK4D4/remove_unused_pkg
pkg: cleanup some unused code
Upstream-commit: ad4750cf3a1c89f0b9d2ccebdc4f61b7be33109f
Component: engine
2016-03-31 15:06:35 -07:00
32d1f4fa04 Merge pull request #21687 from allencloud/fix-typos
fix typos
Upstream-commit: 42494720c2a8d31867587c1b633d8f439e54b319
Component: engine
2016-03-31 14:18:31 -07:00
1857eeaad6 Merge pull request #21698 from tonistiigi/fix-flaky-websocket-attach-test
Fix flaky TestGetContainersAttachWebsocket
Upstream-commit: dd94c88376560e2690ac21058c566adae4251bb8
Component: engine
2016-03-31 14:03:58 -07:00
46951438db Merge pull request #21696 from LK4D4/cleanup_unused_daemon
daemon: remove some unused code
Upstream-commit: 6b4f7e6b7f9f43a9a72746f09231de80bd2fcfc4
Component: engine
2016-03-31 13:55:27 -07:00
da61313bb3 Merge pull request #21693 from cyli/fix-trusted-build-and-run
Request pull credentials when using trusted reference
Upstream-commit: f19f91d0da710b45603e1f3b95a3709c57cd888a
Component: engine
2016-03-31 16:35:06 -04:00
bf513f6f21 Merge pull request #21692 from tonistiigi/fix-events-timer
Fix race with event timer stopping early
Upstream-commit: 3e03fc913a01a460b8487aa7537370392c00d5c3
Component: engine
2016-03-31 13:11:43 -07:00
7cbc25f5ba Change the windows .tgz to a .zip file
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: fda99a7e1653e045ec5901955a59ff1123016d93
Component: engine
2016-03-31 15:56:13 -04:00
087b91dfb7 Merge pull request #21679 from tonistiigi/no-pivot-root
Bring back support for DOCKER_RAMDISK
Upstream-commit: 00031c15b5b2226292eb9575bc3b390bdcd83a56
Component: engine
2016-03-31 12:40:57 -07:00
7c3f3d665e pkg: cleanup some unused code
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 07b568cb5342789839aabba0ee6d41e7275099e8
Component: engine
2016-03-31 11:39:59 -07:00
f7de49cf41 Fix flaky TestGetContainersAttachWebsocket
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 85354fb77c77aabe6ba1f53c90aa2395b4e81866
Component: engine
2016-03-31 11:31:48 -07:00
b5af51fa11 daemon: remove some unused code
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b9966f3a81e89640d0de8fa5ae8d38213df0b8fe
Component: engine
2016-03-31 11:24:12 -07:00
71d4646a90 Request pull credentials when using trusted reference
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: df9cc3d9228cb07474dd046736c6f83513c4923d
Component: engine
2016-03-31 10:56:19 -07:00
ebeaecd7ff Merge pull request #21356 from cpuguy83/stdcopy_allocs
Optimizations for StdWriter
Upstream-commit: 2d18ed7e4b911ae61131fa7f3dedb0fae1d1ae3b
Component: engine
2016-03-31 10:54:45 -07:00
1917da0dad Bring back support for DOCKER_RAMDISK
Fixes #21631

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8a4225cd5ad3ad56a7e896f675080c0ed38982a3
Component: engine
2016-03-31 10:29:32 -07:00
7497562d8e Fix race between with event timer stopping early
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b38cee9f9c79d1f12001348303b78462d99664ed
Component: engine
2016-03-31 09:49:07 -07:00
7b556c0d0e Merge pull request #21685 from runcom/int-fix-tiny
integration-cli: add info to fatal log
Upstream-commit: 61ca308676e29be58e5a9322746311f47a415bfd
Component: engine
2016-03-31 09:44:05 -07:00
7215956006 Merge pull request #21688 from mcuadros/patch-1
documentation: adding gce-docker plugin to plugins.md
Upstream-commit: b27f17c9ea03f486fb31f4ce246eeec754f400d9
Component: engine
2016-03-31 07:40:41 -07:00
d4b4130c2f Merge pull request #21681 from senk/21653-api-docs-revisit
Fixed api docs
Upstream-commit: 0d933359623429b301a79874c68b8539dda52d4b
Component: engine
2016-03-31 07:32:57 -07:00
470cd4e96c documentation: adding gce-docker plugin to plugins.md
Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
Upstream-commit: c018018b69771ce1becc71d82e2f912ad55dcde5
Component: engine
2016-03-31 15:22:02 +02:00
3bf882d79f integration-cli: add info to fatal log
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: eb0f9f664116ca28d844144929f4b578fe2d1dc8
Component: engine
2016-03-31 12:38:47 +02:00
33e31cb131 Merge pull request #21664 from calavera/label_one_layer_images
Apply build labels to images with only a FROM tag.
Upstream-commit: 47fa54aea39035515f45a4c98408e75c5085a2cb
Component: engine
2016-03-31 11:52:18 +02:00
2aa1c68f70 Merge pull request #21676 from aaronlehmann/tmpfile-close
Pull: only close temporary file once
Upstream-commit: 3d4b3cb424ef599a0aa63f44d30c62ef37ca130b
Component: engine
2016-03-31 11:49:37 +02:00
09b74b88c4 Merge pull request #21665 from cyphar/bump-runc
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
Upstream-commit: 60821fe288ce1c53fdf5ab553b9f1d4571f1ec11
Component: engine
2016-03-31 11:38:57 +02:00
b1702b09f8 Merge pull request #21671 from mavenugo/rc1
Vendor Libnetwork v0.7.0-rc.1
Upstream-commit: 79e0eb20007d0468a6e2c50a36b673ad3e829017
Component: engine
2016-03-31 11:35:21 +02:00
7401f52d5d Merge pull request #21677 from aaronlehmann/layer-store-locking
Fix layer store Get locking
Upstream-commit: 156c5db889b29e28e0176019b1996af4a5465a77
Component: engine
2016-03-31 11:35:02 +02:00
1c2036ebf8 Merge pull request #21572 from konstruktoid/systemd_doc
systemctl show, no need to sudo
Upstream-commit: f4b915ad7d72a059e7bba15424e012873b9b49ac
Component: engine
2016-03-31 10:26:28 +02:00
dc335512b1 Merge pull request #21607 from allencloud/change-validateNoSchema-to-validateNoScheme
change validateNoSchema to validateNoScheme
Upstream-commit: e6f2429e017eb3c41bbc77442e81a23635287625
Component: engine
2016-03-31 10:14:23 +02:00
8bd53c59b9 Fixed docs fixes #21653
Fixed some http status codes and decreased site-order for docker_remote_api_v1.24.md to appear in the right order in the menu
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
Upstream-commit: 5d2f6b3ea3d307c32089757d84c94fab3d8e55d7
Component: engine
2016-03-31 08:39:40 +02:00