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
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
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
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
Sebastiaan van Stijn
c7b63338f0
Merge pull request #21637 from tonistiigi/refactor-cleanup
...
Fix container mount cleanup issues
2016-03-30 23:25:23 -07:00
Sebastiaan van Stijn
ffee5588cd
Merge pull request #21372 from anusha-ragunathan/ctrd-rebase
...
Update mount state of live containers after a daemon crash.
2016-03-30 23:10:04 -07:00
Aaron Lehmann
930ae3dbcb
Pull: only close temporary file once
...
Close could be called twice on a temporary download file, which could
have bad side effects.
This fixes the problem by setting to ld.tmpFile to nil when the download
completes sucessfully. Then the call to ld.Close will have no effect,
and only the download manager will close the temporary file when it's
done extracting the layer from it. ld.Close will be responsible for
closing the file if we hit the retry limit and there is still a partial
download present.
Fixes #21675
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-03-30 22:44:54 -07:00
allencloud
5c161ade98
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-31 13:26:46 +08:00
allencloud
28d3c22e55
1.change validateNoSchema into validateNoScheme
...
2.change schema into scheme in docs and some annotations.
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-31 12:29:15 +08:00
Aaron Lehmann
0538981c31
Fix layer store Get locking
...
Get was calling getReference without layerL held. This meant writes to
the references map could race. Such races are dangerous because they can
corrupt the map and crash the process.
Fixes #21616
Fixes #21674
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-03-30 19:34:51 -07:00
Madhu Venugopal
90bb5301b5
Vendor Libnetwork v0.7.0-rc.1
...
- Fixes https://github.com/docker/libnetwork/issues/1051
- Fixes https://github.com/docker/libnetwork/issues/985
- Fixes https://github.com/docker/libnetwork/issues/945
- Log time taken to set sandbox key
- Limit number of concurrent DNS queries
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-30 18:12:23 -07:00
Brian Goff
81d9eaa27e
Merge pull request #21600 from Microsoft/jstarks/escape_entrypoint
...
Windows: escape entrypoint before passing to libcontainerd
2016-03-30 18:00:32 -07:00
Tonis Tiigi
05cc737f54
Fix container mount cleanup issues
...
- Refactor generic and path based cleanup functions into a single function.
- Include aufs and zfs mounts in the mounts cleanup.
- Containers that receive exit event on restore don't require manual cleanup.
- Make missing sandbox id message a warning because currently sandboxes are always cleared on startup. libnetwork#975
- Don't unmount volumes for containers that don't have base path. Shouldn't be needed after #21372
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-30 17:25:49 -07:00
Aleksa Sarai
da38ac6c79
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
...
Also modify an integration test that hardcoded the error string so it
uses the exported error variable from libcontainer/user.
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-03-31 11:20:38 +11:00