Commit Graph

2895 Commits

Author SHA1 Message Date
1f47465496 Fix TestExecApiStartWithDetach on WindowsTP4
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 21c85111231caeb6d2d342f13999d706cc33ff6a
Component: engine
2016-02-25 14:27:22 +01:00
5cbdc71804 Merge pull request #20679 from Microsoft/jjh/testrestart
Windows CI: Port docker_cli_restart_test.go
Upstream-commit: 7cf03700f891f0863f11ee57c2d3f8d68350d91b
Component: engine
2016-02-25 10:17:25 +01:00
6395a43374 Merge pull request #20677 from Microsoft/jjh/testclilogs
Windows CI: Port docker_cli_logs_test.go
Upstream-commit: ca7ce05e819959def59f8e3c07fdf03cbdcc0770
Component: engine
2016-02-25 09:38:23 +01:00
81c0ade270 Merge pull request #20682 from cpuguy83/fix_volplugin_panics
Fix panic when plugin responds with null volume
Upstream-commit: 0ad04242b4a7f98b691573f9095330ba9e74ae3b
Component: engine
2016-02-25 09:32:54 +01:00
bd2ade864c Merge pull request #20674 from Microsoft/jjh/testlogsapi
Windows CI: Port TestLogsAPI*
Upstream-commit: 9f1ad7850c03f75f9e69a8f3f76290533363ea7a
Component: engine
2016-02-25 09:11:15 +01:00
ca8a5e468f Merge pull request #20664 from Microsoft/jjh/busyboxtop
Windows CI: Integrity check for busybox top
Upstream-commit: abfc480f4be9a62c16e6af26160de8b80c805e51
Component: engine
2016-02-25 09:09:37 +01:00
b417dc79d3 Windows CI: Port docker_cli_logs_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 10bd587d77eff327cfb0dff2add4688a183c41a3
Component: engine
2016-02-24 20:19:48 -08:00
4d716f809c Merge pull request #20647 from coolljt0725/fix_20638
Fix exec start api with detach and AttachStdin at same time. fixes #2…
Upstream-commit: cee4ff1c4ac0bb47ed847f3bb725fd6233613937
Component: engine
2016-02-24 20:17:15 -08:00
d1a3bc5db1 Fix exec start api with detach and AttachStdin at same time. fixes #20638
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: fb0ac1afd97e6e3bf3c13dcda5821f36b56cc62b
Component: engine
2016-02-24 21:04:44 -05:00
661cc031a6 Fix panic when plugin responds with null volume
In cases where the a plugin responds with both a null or empty volume
and a null or empty Err, the daemon would panic.
This is because we assumed the idiom if `err` is nil, then `v` must not
be but in reality the plugin may return whatever it wants and we want to
make sure it doesn't harm the daemon.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 96c79a1934dd52d2a6f648e519b5d4ac60ac8ca1
Component: engine
2016-02-24 20:45:38 -05:00
e682d2e8d7 Windows CI: Port docker_cli_restart_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 281c1ced6d6901ffb7faee209c243d0734abc792
Component: engine
2016-02-24 15:21:56 -08:00
dc55874ee6 Windows CI: Port TestLogsAPI*
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 00f65ae810679d587cb52466f52988ae9267e91d
Component: engine
2016-02-24 13:43:52 -08:00
4dd0ef305c Windows CI: Integrity check for busybox top
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6a931c3590f5a2f274f9ab4c43452939d101a1b5
Component: engine
2016-02-24 11:00:47 -08:00
148812de36 Merge pull request #20637 from Microsoft/jjh/fixteststartattachmultiplecontainers
Windows CI: Fix TestStartAttachMultipleContainers
Upstream-commit: 467c8b1a6a866081081a90ea9cec94640638781a
Component: engine
2016-02-24 08:46:00 -08:00
8075c13623 Merge pull request #20619 from Microsoft/jjh/useraccounts
Windows: Updates for virtual user account
Upstream-commit: 5fdfb2985b209660a1a540222f614b73a0dc2e63
Component: engine
2016-02-24 13:48:27 +01:00
34876f5fef Merge pull request #20017 from calavera/expose_volumes_in_ps
Add mounts to docker ps.
Upstream-commit: 034a1a8dfd17d89123bf0405f898e880575ed775
Component: engine
2016-02-24 11:08:21 +01:00
ca915e8020 Windows CI: Fix TestStartAttachMultipleContainers
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ef9f13af3d9293458a03223a030028381da4ae09
Component: engine
2016-02-23 16:24:35 -08:00
15f2e840f7 Fix flaky OOM tests
If cgroup swap memory limit isn't enabled, then
the -m flag doesn't work and the container that is created for
both of these tests is very large. Because we are trying to run the
containers out of memory, this takes a very long time and causes the
tests to fail most of the time.

Follow-up to #17913

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 3abf2a77414195d5b0c15f7fc88b7fd9aa4edaa8
Component: engine
2016-02-23 15:26:26 -05:00
c1d2fd21f7 Fix flaky TestExec
The container started with `-d` as part of the test requires a `waitRun`
to ensure it is actually running before attempting any other operation.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 0a7755ab4e2fc8df1992813d5364fe0f201ab913
Component: engine
2016-02-23 09:51:09 -08:00
e1a3cdb877 Windows: Updates for virtual user account
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 800c9e81ea9093d587c18bc5c1fd7c0a73b1293f
Component: engine
2016-02-23 09:47:52 -08:00
edf220176a Add mounts to docker ps.
- Allow to filter containers by volume with `--filter volume=name` and `filter volume=/dest`.
- Show their names in the list with the custom format `{{ .Mounts }}`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bd4fb00fb6241d35537b460a2d9f48256111ae7a
Component: engine
2016-02-23 12:10:24 -05:00
39d894b6e8 Merge pull request #20581 from stweil/master
Fix some typos in comments and strings
Upstream-commit: 9d882cbb442138cb5c9026f1ec8eb4499ad71442
Component: engine
2016-02-23 08:20:53 -08:00
f04054d6f5 Fix typo
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 8474bbff4594f382dbac5ad59767d18b2d8f2689
Component: engine
2016-02-23 17:27:55 +08:00
f62b97e499 Fix some typos in comments and strings
Most of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Upstream-commit: 2eee613326fb59fd168849618d14a9054a40f9f5
Component: engine
2016-02-22 20:27:15 +01:00
dce4ee668d Unskip authz events test after fixes
Now that the various fixes are all committed, let's see if this gets
less flaky now.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 4781d5c4fb06d4617189f2e8a9475abcc5c5c8f3
Component: engine
2016-02-20 20:19:54 -06:00
4ea7e9ea28 Merge pull request #20509 from estesp/cleanup-authz-test
Clean up authz integration-cli test
Upstream-commit: 076b3558fcf4cc77694fe53f4aae65137ed3ef1b
Component: engine
2016-02-20 12:10:29 +01:00
f153cf13ed Update RestartPolicy of container
Add `--restart` flag for `update` command, so we can change restart
policy for a container no matter it's running or stopped.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ff3ea4c90f2ede5cccc6b49c4d2aad7201c91a4c
Component: engine
2016-02-20 17:06:32 +08:00
2d2a092a9b Merge pull request #20446 from estesp/fix-userns-cp
Fix copy chown settings to not default to real root
Upstream-commit: 3d65e7126c60ef23a7f0e255cd2e4b5938859413
Component: engine
2016-02-19 19:45:44 -05:00
f30528fead Allow post-start load of busybox to remove restarts
The restarts in the authz plugin test suite seems to be causing
flakiness in CI, and can be avoided by separating the daemon start and
busybox image load.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: fe015c5ce0a260a8b5bc346a297507ac91f0ccb4
Component: engine
2016-02-19 18:44:36 -06:00
f92b8a2bd5 Merge pull request #20464 from cpuguy83/fix_events_flakiness
Fix events test flakiness.
Upstream-commit: b9195cd6d416280a021eaa630bd333453f71e270
Component: engine
2016-02-19 15:39:27 -08:00
34184bd076 Merge pull request #20383 from HackToday/addsort
Make network ls output order
Upstream-commit: 0e72550c5b27704ac1ec043302fe2aaebe3b1956
Component: engine
2016-02-19 15:42:48 -05:00
033a056f03 Merge pull request #20389 from HackToday/addvolumesupport
Make volume ls output order
Upstream-commit: 48701888c216868379ee430e041f7a9568970117
Component: engine
2016-02-19 15:41:34 -05:00
58b5075165 Temporarily skip TestAuthZPluginAllowEventStream
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 6e0f873f053f5ae54901177cd5272f6fef7d49a0
Component: engine
2016-02-19 10:32:05 -08:00
e0d79dff72 Clean up authz integration-cli test
- Order the flow of the handlers more cleanly--read req, do actions,
  write response.
- Add "always allowed" endpoints to handle `/_ping` and `/info` usage
  from the test framework/daemon start/restart management

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 074561b0ecc1e1b2e476c5aa06a8e6ea858239c1
Component: engine
2016-02-19 10:12:39 -08:00
d9c028ed66 Merge pull request #20419 from aboch/cr
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
Upstream-commit: 117a982d2e805d3279ff75fcec071635e5191ef6
Component: engine
2016-02-18 17:39:46 -08:00
b2de5808fb Merge pull request #20433 from runcom/fixies
runconfig: opts: parse: lowercase errors
Upstream-commit: c96564a76c8d9d3ba2c4d316deae55ab3f5e0b3f
Component: engine
2016-02-18 17:08:01 -08:00
b3b5161196 Fix copy chown settings to not default to real root
This corrects `docker cp` behavior when user namespaces are enabled.
Instead of chown'ing copied-in files to real root (0,0), the code
queries for the remapped root uid & gid and sets the chown option
properly.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 40be5dba473aa57a388fe26bb79ac38a66653f31
Component: engine
2016-02-18 14:44:13 -08:00
b978414dca Fix events test flakiness.
Since channel is getting a send instead of a close now, this can cause
random issues ranging through the list of channels if the channel is
unbuffered since the send may be blocked.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: abbf2aa6ddbf8159a5fceb4df25d7f85aeffe70e
Component: engine
2016-02-18 16:10:29 -05:00
10c9ca900c Config-reload IT
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: c9bec2be2af62571e49b4992d5a2fd8806049a07
Component: engine
2016-02-18 12:22:56 -08:00
d9d773f20a IT case for sending invalid query to embedded DNS server
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: e5293f97f240c194eba1a46e5883514c9ccb4586
Component: engine
2016-02-18 12:14:19 -08:00
64d8a74799 Merge pull request #20426 from calavera/remove_channel_close
Remove channel close.
Upstream-commit: 038c3b82870646cefd8f631c891cd99120cc4109
Component: engine
2016-02-18 11:13:30 -08:00
7d665cca4e Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge
Expose bridge IPv6 setting to `docker network inspect`
Upstream-commit: 2e6c841b826cc73332c44d5a04a5996fc65af724
Component: engine
2016-02-18 10:35:04 -08:00
b85a054d81 Merge pull request #20447 from cpuguy83/fix_netnone
Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError
Upstream-commit: 2f283f3cd8204f8e1e1eb9d571e79a263f202e9d
Component: engine
2016-02-18 10:10:26 -08:00
4d9228f02f Merge pull request #20442 from cpuguy83/fix_flakey_TestAuthZPluginAllowEventStream
Fix flakey TestAuthZPluginAllowEventStream
Upstream-commit: e7b25237514917d16b2422404777ec364200917a
Component: engine
2016-02-18 12:07:20 -05:00
93243f693c Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError
Broken by bcb9adf49e6726eccc1ee1ed41fbe21789c2367f

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8e0e9e0f24e5802709508b7c7fe61cb5171ec414
Component: engine
2016-02-18 11:34:34 -05:00
8de4ae7396 Fix flakey TestAuthZPluginAllowEventStream
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4cf9b725f2117581ac4ba3e6f1db23da090e1732
Component: engine
2016-02-18 10:19:19 -05:00
bc74abda34 runconfig: opts: parse: lowercase errors
also fix wrong function comment

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: d266142230bd041c8299eef329cf79a17f8f7478
Component: engine
2016-02-18 11:21:44 +01:00
f1882e8081 Remove channel close.
Send a message instead, discarding duplicated messages.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 010951083060e1267e4dd726f5322d7309a8fd62
Component: engine
2016-02-17 22:52:06 -05:00
1a7ab19790 Merge pull request #20411 from aaronlehmann/strengthen-TestPullFromCentralRegistryImplicitRefParts
Improve resilience of TestPullFromCentralRegistryImplicitRefParts
Upstream-commit: e9234d8aaf9061beeb9e138efe3d39a86d0ddea7
Component: engine
2016-02-17 15:08:20 -08:00
e1d1f67bc5 Improve resilience of TestPullFromCentralRegistryImplicitRefParts
Sometimes transient network issues will cause
TestPullFromCentralRegistryImplicitRefParts to end up pulling with the
v1 protocol. This violates the assumptions behind the test. To make the
test more robust, allow a few retries if any pull ends up using the v1
protocol.

Fixes #17214

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 884201115315abb0c7815e44e6728e590476aeb8
Component: engine
2016-02-17 13:08:51 -08:00