Vincent Demeester
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
Vincent Demeester
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
Tonis Tiigi
ac4137daba
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 >
Upstream-commit: 3f81b4935292d5daedea9de4e2db0895986115da
Component: engine
2016-04-04 18:55:55 -07:00
Michael Crosby
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
John Starks
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
Alexander Morozov
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
Tibor Vass
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
Ken Cochrane
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
Zhang Wei
97016757fb
Let client print error when speicify wrong detach keys
...
Fix #21064
Let client print error message explicitly when user specifies wrong
detach keys.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 91e5bb954131904af150b06bd22b007559a8ce27
Component: engine
2016-04-04 15:35:55 +08:00
Zhang Wei
8fbc569d31
vendor engine-api 8924d6900370b4c7e7984b
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: e1a4332c13d0bdc5e960102a4f0dfd8e1fb6ffaf
Component: engine
2016-04-04 15:32:26 +08:00
Dave MacDonald
6ee58ec22e
Improved message when pushing a non-existant image
...
The prior error message caused confusion. If a user attempts to push an
image up to a registry, but they misspelled (or forgot to properly tag
their image) they would see the message 'Repository does not exist', which
is not very clear and causes some to think that there might be a problem
with the registry or connectivity to it, when the problem was simply just
that an image with that tag specified does not exist locally.
Signed-off-by: Dave MacDonald <mindlapse@gmail.com >
Upstream-commit: e57900a2695165bda111758e931e7c3c38449a9f
Component: engine
2016-04-03 16:25:07 -04:00
Yong Tang
e0605e5ec1
Remote API docs give incorrect example for creating a container with volumes.
...
This fix tries to address the issue mentioned in Docker Remote API where
the examples for creating a container (`POST /containers/create`) with
volumes were incorrect. In the previous remote API document, the `Mounts`
fields was used for volume creation yet since v1.20 `Volumes` should be
used.
This fix fixes #21335 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 4ed20402580c4476360736f2bdaa2604dc76cd54
Component: engine
2016-04-02 19:59:02 +00:00
Sebastiaan van Stijn
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
Michael Crosby
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
Michael Crosby
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
Julio Montes
7929b2459d
Fix compilation errors with btrfs-progs-4.5
...
btrfs-progs-4.5 introduces device delete by devid
for this reason btrfs_ioctl_vol_args_v2's name was encapsulated
in a union
this patch is for setting btrfs_ioctl_vol_args_v2's name
using a C function in order to preserve compatibility
with all btrfs-progs versions
Signed-off-by: Julio Montes <imc.coder@gmail.com >
Upstream-commit: a038cccf88998814249a7a40b71a33a680e3f02f
Component: engine
2016-04-01 08:58:29 -06:00
Aleksa Sarai
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
Aleksa Sarai
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
Robin Naundorf
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
Yuan Sun
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
Sebastiaan van Stijn
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
Tibor Vass
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
Alexander Morozov
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
Sebastiaan van Stijn
32d1f4fa04
Merge pull request #21687 from allencloud/fix-typos
...
fix typos
Upstream-commit: 42494720c2a8d31867587c1b633d8f439e54b319
Component: engine
2016-03-31 14:18:31 -07:00
Aaron Lehmann
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
David Calavera
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
Tibor Vass
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
David Calavera
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
Ken Cochrane
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
David Calavera
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
Alexander Morozov
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
Tonis Tiigi
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
Alexander Morozov
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
cyli
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
Alexander Morozov
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
Tonis Tiigi
2e3aa58c9b
Fix building gccgo from makefile
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8b408fd66bd3edbcb90450cb4722d31ce5078be8
Component: engine
2016-03-31 10:35:56 -07:00
Tonis Tiigi
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
Tonis Tiigi
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
David Calavera
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
Sebastiaan van Stijn
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
moxiegirl
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
Máximo Cuadros
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
Antonio Murdaca
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
Vincent Demeester
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
Vincent Demeester
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
Antonio Murdaca
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
Antonio Murdaca
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
Antonio Murdaca
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
Vincent Demeester
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
Vincent Demeester
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