Commit Graph
23287 Commits
Author SHA1 Message Date
David Calavera e7eeee7715 Downgrade to Go 1.5.3.
To not hit the issue with the request Host header.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3e0bd74a3d2647fa8c7783f4a053ad225746e6eb
Component: engine
2016-03-24 19:15:10 -04:00
John Howard 3ff2e53880 Windows: Native console disableNewlineAutoReturn
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c162cdb15fb08786c85d76fb438f003e72857f5c
Component: engine
2016-03-24 15:37:47 -07:00
Alexander Morozov d3972744c1 Merge pull request #21456 from calavera/remove_unecessary_hardcoded_version
Remove unnecessary hardcoded version.
Upstream-commit: 6748ecb0050f2c6a9a57e824f23b5b4afb35240d
Component: engine
2016-03-24 14:31:59 -07:00
Tibor Vass 4295dceddb Merge pull request #21387 from kencochrane/change_packages
Packaging changes required for new containerd binaries
Upstream-commit: ed25df9a07f4b0ddf21fed5358eba8870fb06a9c
Component: engine
2016-03-24 17:29:55 -04:00
Tonis Tiigi 88d26b09ba Fix wrong variable name on blkio resources
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8784bd6fdeb7bd87fcbbdee884d42d1dca0c4cca
Component: engine
2016-03-24 14:16:40 -07:00
Tonis Tiigi 5b031241b0 Fix setting cgroup permission to user/privileged devices
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ee6123588067eb067ec1c02cc340d7493c8cd9a6
Component: engine
2016-03-24 14:16:33 -07:00
Sebastiaan van Stijn ee44cd51fb Merge pull request #21315 from hqhq/hq_check_quota
Add validation for cpu period and quota
Upstream-commit: f2847f8ab3467b43eccf0a9580d4ea3e8abdf146
Component: engine
2016-03-24 14:10:48 -07:00
Sebastiaan van Stijn 472c0621c5 Merge pull request #21463 from yongtang/21445-too-long-hostname
More descriptive error when running a container with a too long hostname (#21445)
Upstream-commit: 1e8d1b5faaa113944ed0bc6b565b90c490a5b654
Component: engine
2016-03-24 13:42:28 -07:00
David Calavera 1829240730 Merge pull request #21478 from albers/ignore-bashrc
re-add .bashrc to .gitignore
Upstream-commit: 9558d249e9586aff906391d1e5bda1b181641c98
Component: engine
2016-03-24 13:29:46 -07:00
Ken Cochrane 7e9cc10806 Packaging changes required for new containerd binaries
These are the changes required due to the new binaries that containerd introduced.
The rpm, and deb packages now include 5 binaries.

docker, containerd, containerd-shim, ctr, and runc

The tar files also include all 5 binaries.

Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
Upstream-commit: bb66d7144f7d0a617f5985486ae36bbbaa5461ba
Component: engine
2016-03-24 16:25:33 -04:00
John Howard a2fa8e07dd Windows: Remove --exec-root
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 77a50ffa59c5ba0e22d754fad4cded57efb84e37
Component: engine
2016-03-24 11:42:03 -07:00
Viktor Stanchev 678cdd4ebe fix race condition between list and remove volume
This was done by making List not populate the cache.

fixes #21403

Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
Upstream-commit: 800b9c5a2698aae5c43f42d4c9c1a41280b556a6
Component: engine
2016-03-24 11:37:18 -07:00
David Calavera 29639000fd Merge pull request #21483 from albers/completion-load--quiet
bash completion for `docker load --quiet`
Upstream-commit: 68c920883e0cdbcf5aca14ba9a185c67ad3bf401
Component: engine
2016-03-24 11:03:50 -07:00
Harald Albers 37e1c9e1c1 add docs for docker load --quiet
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 610ec8c7396ea4cc20465b99cf326684c82d23ff
Component: engine
2016-03-24 18:57:44 +01:00
Harald Albers cbf32ea99f re-add .bashrc to .gitignore
.bashrc was removed in 29fbc9cc1d67759974ec4cb746840ae160d842bc
but is still needed. It serves as a hook to customize the build environment.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8850b223ed4c04cc671a977cadc3942e5e5f7f64
Component: engine
2016-03-24 18:43:41 +01:00
Yong Tang 547c60d84c More descriptive error when running a container with a too long hostname (#21445)
This fix tries to fix issues encountered when running a container with a hostname
that is longer than HOST_NAME_MAX(64).

Previously, `could not synchronise with container process` was generated as the
length of the regex check was missing.

This fix covers the length check so that a hostname that is longer than
HOST_NAME_MAX(64) will be given a correct error message.

Several unit tests cases and additional integration test cases are added as well.

This fix closes #21445.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: fa44b4e81ee87f1c2b39ad335a22795415c8cdf2
Component: engine
2016-03-24 17:42:28 +00:00
Harald Albers 5ea7a65fe3 bash completion for docker load --quiet
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: aa9170f0664d51dfa682d652d930acc74a220106
Component: engine
2016-03-24 18:39:57 +01:00
Vincent Demeester 81de6334df Merge pull request #21481 from albers/completion-ps-filter-volumes
bash completion for `docker ps -f volume`
Upstream-commit: 1ab51e44e60816eac8c8120d5cadfac2600416b1
Component: engine
2016-03-24 18:39:26 +01:00
David Calavera 3e065ccb2e Merge pull request #21435 from vdemeester/remove-verbose-copy-containerd
Remove the verbosity of copy_containerd
Upstream-commit: e88dff6bb46edd546e5f6cbe775f1234ca757834
Component: engine
2016-03-24 10:34:37 -07:00
Vincent Demeester 1a8e9b8519 Merge pull request #21464 from coolljt0725/cleanup_dot
Cleanup: remove redundant period
Upstream-commit: 2b6b2e1af853d465d22f5a57e71aea89852340eb
Component: engine
2016-03-24 18:34:20 +01:00
David Calavera 2b88acd4a3 Merge pull request #21471 from allencloud/fix-typos-in-daemon-unix
fix typos in daemon_unix.go
Upstream-commit: 731c59f5451cc370e4b006c411073785af0833c1
Component: engine
2016-03-24 10:32:59 -07:00
Harald Albers a369516565 bash completion for docker ps -f volume
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ef0570abfc9999cd3ddcf954b2ca5222f757c1a9
Component: engine
2016-03-24 18:23:25 +01:00
Jess Frazelle 78706dfad5 set the default storage driver as the users current default
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
Upstream-commit: 54aa3a3c210cd16b687f0e6b6356888d90215752
Component: engine
2016-03-24 09:41:19 -07:00
David Calavera 2257ef7e0a Remove unnecessary hardcoded version.
The server configuration already keeps the current version
if the daemon. This patch changes the middleware logic
to use it rather than using the global value.

This removes the dockerversion package dependency from the api.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: accf28a7dbdd46203c661d30b80326df4d447cea
Component: engine
2016-03-24 12:33:40 -04:00
allencloud 0986455243 fix typos in daemon_unix.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 25c9bd81f6d293996856daeb19108ebb2522416b
Component: engine
2016-03-24 23:57:11 +08:00
Brian Goff 51e700f816 Merge pull request #21460 from tonistiigi/exec-ulimits
Add ulimit support to libcontainerd addprocess
Upstream-commit: 57575a2695a822eb19bda555b1dbb9451d2c0881
Component: engine
2016-03-24 09:38:21 -04:00
Lei Jitang afd62f19a9 Do not return error on hijacked connection for docker exec
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d6ccc0e09fe42d9f0d929dbf8d68ce790f4c8b9e
Component: engine
2016-03-24 08:52:13 -04:00
Lei Jitang 95256bc90a Cleanup: remove redundant period
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: cb5b8767b6988855daa1a264202be929c24c6177
Component: engine
2016-03-24 08:26:04 -04:00
Vincent Demeester 791eed0ff8 Merge pull request #21428 from estesp/reenable-shared-nstests-userns
Re-enable shared namespace tests for userns CI runs
Upstream-commit: 21315589632fadb3a5460ee0a278f2511e6a7d13
Component: engine
2016-03-24 12:31:27 +01:00
Antonio Murdaca 068d11d990 integration-cli: fix wrong test and add log
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e73152bf273418cbee3d5862dd2ccfbdf2d6e8fc
Component: engine
2016-03-24 11:10:41 +01:00
Arnaud Porterie fae324956e Merge pull request #21457 from tonistiigi/update-runc
Update runc/containerd
Upstream-commit: b64627b798de1bf1a1f2071a23f35b799d1fe369
Component: engine
2016-03-23 19:56:27 -07:00
Tonis Tiigi e716bd46e9 Add ulimit support to libcontainerd addprocess
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8891afd8385aeb490f8b7d9db8c3828bc7d24dc1
Component: engine
2016-03-23 19:54:32 -07:00
Sebastiaan van Stijn c6df9af8ab Merge pull request #21458 from crosbymichael/grpc-logs
Remove grpc logging to stderr
Upstream-commit: 713cfffb5a9a837163cb9c842d3842276001e117
Component: engine
2016-03-23 19:50:25 -07:00
Brian Goff d35ea7bea5 Merge pull request #21454 from anusha-ragunathan/fix_overlay
Move layer mount refcounts to mountedLayer
Upstream-commit: 55bbea375100716ebc0ef16edab567b0627cff0d
Component: engine
2016-03-23 22:39:38 -04:00
Sebastiaan van Stijn 6cee95ae99 Merge pull request #21268 from calavera/remove_dockerfile_from_api
Remove dockerfile dependency from the API.
Upstream-commit: 5ef04b1c6d1ca94c83c7ce52faae908a278ce6ea
Component: engine
2016-03-23 19:34:21 -07:00
Brian Goff b6d708cfd3 Merge pull request #21443 from calavera/fix_network_path_issue
Fix network path issue
Upstream-commit: 68674f739f218a45419c33a0c25cb6cbfbd0f4af
Component: engine
2016-03-23 22:27:44 -04:00
Sebastiaan van Stijn c92d23eb40 Merge pull request #21430 from tophj-ibm/remove-seccomp-ppc64le
ppc64le: remove seccomp from Dockerfile
Upstream-commit: 3f568b19e80531e34a664fe4200987e7044f6b22
Component: engine
2016-03-23 16:36:29 -07:00
Michael Crosby ef87795248 Remove grpc logging to stderr
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: b0280c37a08a77871947b1045073601deb601eaa
Component: engine
2016-03-23 15:41:47 -07:00
Tonis Tiigi 10e1615e9a Update runc/containerd
Contains fixes for:
- pid.max fix that is causing hang on network stats test.
- fix for early stdin close containerd-shim
- better logging for `could not synchronise with container process`

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 22d997b3745e278d5a2b0b85d56c0d2b166e3a74
Component: engine
2016-03-23 15:38:33 -07:00
Brian Goff 778611a207 Move layer mount refcounts to mountedLayer
Instead of implementing refcounts at each graphdriver, implement this in
the layer package which is what the engine actually interacts with now.
This means interacting directly with the graphdriver is no longer
explicitly safe with regard to Get/Put calls being refcounted.

In addition, with the containerd, layers may still be mounted after
a daemon restart since we will no longer explicitly kill containers when
we shutdown or startup engine.
Because of this ref counts would need to be repopulated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 65d79e3e5e537039b244afd7eda29e721a93d84f
Component: engine
2016-03-23 14:42:52 -07:00
Anusha Ragunathan 8ddceeb099 Fix use of mounted() in overlay.
Handle error and mounted case separately.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 57ca2a210108d31f8cbe9660bcd6cd469a937ff7
Component: engine
2016-03-23 14:42:52 -07:00
David Calavera dacc1ae34c Merge pull request #21446 from cpuguy83/plugin_activation_issue
Fix panic in loading plugins
Upstream-commit: 82b9e60369d3d5d0dea1a10edc7c95b2bbe16685
Component: engine
2016-03-23 14:25:35 -07:00
Vincent Demeester d716d49ce7 Remove the verbosity of copy_containerd
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2164018d82a7c9857c8196b863a538f5d47f5265
Component: engine
2016-03-23 20:51:48 +01:00
Brian Goff 3420db4b5e Fix panic in loading plugins
When a plugin is first found, it is loaded into the available plugins
even though it's not activated yet.
If activation fails it is taken out of the list.
While it is in the list, other callers may see it and try to check it's
manifest. If it is not fully activated yet, the manifest will be nil and
cause a panic.

This is especially problematic for drivers that are down and have not
been activated yet.

We could just not load the plugin into the available list until it's
fully active, however that will just cause multiple of the same plugin
to attemp to be loaded.

We could check if the manifest is nil and return early (instead of
panicing on a nil manifest), but this will cause a 2nd caller to receive
a response while the first caller is still waiting, which can be
awkward.

This change uses a condition variable to handle activation (instead of
sync.Once). If the plugin is not activated, callers will all wait until
it is activated and receive a broadcast from the condition variable
signaling that it's ok to proceed, in which case we'll check if their
was an error in activation and proceed accordingly.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: baac2f48674d42863f9fdca5ef3056b4c6ed707e
Component: engine
2016-03-23 15:34:15 -04:00
Arnaud Porterie fec52ca66f Merge pull request #21437 from tiborvass/fix-hub-test
test: Do not check error message from hub, it is not needed
Upstream-commit: bc3b07e1159c4e9de29250f8af86accd740b6459
Component: engine
2016-03-23 12:24:16 -07:00
Yong Tang 676dd1beed Fix Docker core dumps when removing network with special characters (#21401).
This fix tries to fix Docker core dumps when removing network with special
characters. The issue is from the fact that when docker client tries to
pass the command to API, the networkID is not escaped in case of special
characters. This also means other commands (not just `docker network rm`)
may face the same issue (e.g., `docker network connect`).

This fix adds the URL path escape to properly handle it. In addition, an
integration test for network create and delete is added to cover the cases
in #21401.

This fix fixes #21401.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit f8dc5562d0a74792c46b9382181ddf97e5d7cdac)
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f1542276081aa91396495059638d3ea30d4e5a10
Component: engine
2016-03-23 15:07:14 -04:00
David Calavera 345460db06 Vendor engine-api 0.3.1.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 58385bc8a51e538f64a0d91c3259f20c6c289c86
Component: engine
2016-03-23 15:05:19 -04:00
Michael Crosby f77ec14739 Merge pull request #21438 from tiborvass/do-not-stay-up-late
Revert VERSION bump to 1.11.0-dev
Upstream-commit: 5e502a1f1bdb67deb221102bda35016a7e13fe61
Component: engine
2016-03-23 11:31:00 -07:00
Tibor Vass a0962dd1f2 Revert VERSION bump to 1.11.0-dev
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9fb41520af3210466062a5a779148d2b0b8e3914
Component: engine
2016-03-23 14:27:33 -04:00
Tibor Vass dabb7c86ca test: Do not check error message from hub, it is not needed
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: bbdd34c370949a2db9f139720b4498bc0952e700
Component: engine
2016-03-23 14:11:44 -04:00