fd0de04ee0
integration-cli: try to make TestEventsTimestampFormats less flaky
...
Fix #21749
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3f358aeaca2bf02ea33e6d487a69f60fff88084c
Component: engine
2016-04-06 14:31:39 -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
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
58855775ca
Add insecure registries to docker info
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: 44a50abe7b16368bdc8b70e01cb095dc46cbbbaf
Component: engine
2016-03-31 08:27:24 +02:00
dc5103ac67
Merge pull request #21637 from tonistiigi/refactor-cleanup
...
Fix container mount cleanup issues
Upstream-commit: c7b63338f0c46b2ca0efee3b8a590c2e2033ea14
Component: engine
2016-03-30 23:25:23 -07:00
2a5d48b968
Merge pull request #21372 from anusha-ragunathan/ctrd-rebase
...
Update mount state of live containers after a daemon crash.
Upstream-commit: ffee5588cd9be4c67c73476998af1ecbc61250b6
Component: engine
2016-03-30 23:10:04 -07:00
7994f682b7
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 >
Upstream-commit: 930ae3dbcb11091955ca936c280d13f24494b245
Component: engine
2016-03-30 22:44:54 -07:00
3982305fda
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5c161ade98107ce48a77e3525321c436734a43ec
Component: engine
2016-03-31 13:26:46 +08:00
8ae6c0847a
1.change validateNoSchema into validateNoScheme
...
2.change schema into scheme in docs and some annotations.
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 28d3c22e55259281c70fd90780a1b0d388450ddf
Component: engine
2016-03-31 12:29:15 +08:00
c005ab5e62
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 >
Upstream-commit: 0538981c31a714a4183e846a4b512deb7879cc29
Component: engine
2016-03-30 19:34:51 -07:00
e7c442dff1
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 >
Upstream-commit: 90bb5301b51ec6a6c77b910855441feef10492ff
Component: engine
2016-03-30 18:12:23 -07:00
b52259e5cc
Merge pull request #21600 from Microsoft/jstarks/escape_entrypoint
...
Windows: escape entrypoint before passing to libcontainerd
Upstream-commit: 81d9eaa27e4efb5cad52b57ca2e9d71a0c9b2272
Component: engine
2016-03-30 18:00:32 -07:00
2da8076367
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 >
Upstream-commit: 05cc737f5411a0effd299429140d031c4ad8dd05
Component: engine
2016-03-30 17:25:49 -07:00
b856d3bee3
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 >
Upstream-commit: da38ac6c79fe902ed0687afc73d731c95c6d491a
Component: engine
2016-03-31 11:20:38 +11:00
05c14e787f
Merge pull request #21662 from anusha-ragunathan/ctrd_debugLogs
...
Redirect containerd stdout/stderr to the docker stream.
Upstream-commit: c43deb2ea159c02a5ece2394e7b77619e1aad3e3
Component: engine
2016-03-30 19:38:32 -04:00
9fa3adf0a8
Merge pull request #21309 from nalind/journal-error-reporting
...
Improve error reporting when following journals
Upstream-commit: 0dac5444489a34e86bd3e289b33fab3f17c1bf70
Component: engine
2016-03-30 16:15:34 -07:00
a27733f46d
Merge pull request #21636 from calavera/remove_builder_from_api
...
Remove builder dependency from the api.
Upstream-commit: a7742e437943bb0c59cc9e01fd9f5e68259ad3ec
Component: engine
2016-03-30 15:20:05 -07:00
06ac452012
Merge pull request #21661 from twistlock/client_cert_auth_docs
...
Add short description about default authentication method in authorization docs
Upstream-commit: ea7d2192e2fedbf9e764a574b48498a95045cc00
Component: engine
2016-03-30 15:18:54 -07:00
d01eb0569f
Un-deprecate auto-creation of host directories for mounts
...
Auto-creation of host-directories was marked deprecated in
Docker 1.9, but was decided to be too much of an backward-incompatible
change, so it was decided to keep the feature.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0f70f53826ac311ca1653827c0d6bc170f300e84
Component: engine
2016-03-30 15:00:09 -07:00
783220b8bb
Apply build labels to images with only a FROM tag.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1a85c8ebbe1ab508bcd47b883b9732c032509503
Component: engine
2016-03-30 17:28:13 -04:00
7c19f87137
Merge pull request #21625 from kencochrane/fix_tgz_directory
...
Change the directory inside of tgz files.
Upstream-commit: 8c06ba366555ef2ac98ca5372ea632a28e37c950
Component: engine
2016-03-30 13:11:55 -07:00
