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
Zhang Wei
91e5bb9541
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>
2016-04-04 15:35:55 +08:00
Zhang Wei
e1a4332c13
vendor engine-api 8924d6900370b4c7e7984b
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-04-04 15:32:26 +08:00
Yong Tang
4ed2040258
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>
2016-04-02 19:59:02 +00: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
Julio Montes
a038cccf88
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>
2016-04-01 08:58:29 -06: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
8b408fd66b
Fix building gccgo from makefile
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-31 10:35:56 -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
Sebastiaan van Stijn
b27f17c9ea
Merge pull request #21688 from mcuadros/patch-1
...
documentation: adding gce-docker plugin to plugins.md
2016-03-31 07:40:41 -07:00
moxiegirl
0d93335962
Merge pull request #21681 from senk/21653-api-docs-revisit
...
Fixed api docs
2016-03-31 07:32:57 -07:00
Máximo Cuadros
c018018b69
documentation: adding gce-docker plugin to plugins.md
...
Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
2016-03-31 15:22:02 +02:00
Antonio Murdaca
eb0f9f6641
integration-cli: add info to fatal log
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-31 12:38:47 +02:00
Vincent Demeester
47fa54aea3
Merge pull request #21664 from calavera/label_one_layer_images
...
Apply build labels to images with only a FROM tag.
2016-03-31 11:52:18 +02:00
Vincent Demeester
3d4b3cb424
Merge pull request #21676 from aaronlehmann/tmpfile-close
...
Pull: only close temporary file once
2016-03-31 11:49:37 +02:00
Antonio Murdaca
60821fe288
Merge pull request #21665 from cyphar/bump-runc
...
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
2016-03-31 11:38:57 +02:00
Antonio Murdaca
79e0eb2000
Merge pull request #21671 from mavenugo/rc1
...
Vendor Libnetwork v0.7.0-rc.1
2016-03-31 11:35:21 +02:00
Antonio Murdaca
156c5db889
Merge pull request #21677 from aaronlehmann/layer-store-locking
...
Fix layer store Get locking
2016-03-31 11:35:02 +02:00
Vincent Demeester
f4b915ad7d
Merge pull request #21572 from konstruktoid/systemd_doc
...
systemctl show, no need to sudo
2016-03-31 10:26:28 +02:00
Vincent Demeester
e6f2429e01
Merge pull request #21607 from allencloud/change-validateNoSchema-to-validateNoScheme
...
change validateNoSchema to validateNoScheme
2016-03-31 10:14:23 +02:00
Robin Naundorf
5d2f6b3ea3
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>
2016-03-31 08:39:40 +02:00
Tomasz Kopczynski
44a50abe7b
Add insecure registries to docker info
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-03-31 08:27:24 +02:00