Commit Graph

2906 Commits

Author SHA1 Message Date
David Calavera 321f291324 Merge pull request #19661 from shishir-a412ed/tests_rootfs_pr
Tests for PR # 19123: daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
2016-02-09 17:30:48 -08:00
Tibor Vass 0b4a7fb06d Merge pull request #20133 from mlaventure/dont-bind-mount-mqueue
Prevent mqueue from implicitely becoming a bind mount with --ipc=host
2016-02-09 19:55:57 -05:00
Darren Stahl 4603a7259e Third set of TestBuild* CI enabling for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-09 15:19:38 -08:00
David Calavera d6870238e3 Merge pull request #19985 from Microsoft/CombineSetupWorkingDir
Combine SetupWorkingDirectory for Linux and Windows
2016-02-09 15:18:49 -08:00
David Calavera b3cb0d196d Merge pull request #18943 from cpuguy83/fix_write_flusher
Remove Exists from backend
2016-02-09 15:16:03 -08:00
Christopher Jones 736e93a468 Remove testing logrus output from ppc64le
This removes two tests on ppc64le.

There is an old bug with a syscall on power #8653, that causes
logrus to default to using logfmt. These two tests look for
logrus format specific strings, and fail if they don't see it.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-02-09 18:02:18 -05:00
Vincent Demeester 08d0a8384f Merge pull request #20059 from Microsoft/10662-TestBuildCI4
Fourth set of enabling Builder CI tests for Windows
2016-02-09 23:19:28 +01:00
Kenfe-Mickael Laventure dba5a7f243 Disable TestRunMountshmmqueuefromhost when using userns
Since we now automatically mount the mqueue device inside the
container (instead of bind mounting the one from the host), when
trying to start a container with --ipc=host, the mount will fail with
EPERM.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-02-09 14:16:08 -08:00
Kenfe-Mickael Laventure f7d4abdc00 Prevent mqueue from implicitely becoming a bind mount with --ipc=host
Currently, when running a container with --ipc=host, if /dev/mqueue is
a standard directory on the hos the daemon will bind mount it allowing
the container to create/modify files on the host.

This commit forces /dev/mqueue to always be of type mqueue except when
the user explicitely requested something to be bind mounted to
/dev/mqueue.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-02-09 14:16:08 -08:00
Brian Goff 3434860d54 Fix horribly broken TestGetContainerStatsNoStream
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-09 14:25:05 -05:00
David Calavera 10226ac845 Merge pull request #19983 from srust/volume_get_compat_hack
[1.10] Fix volume driver API compatibility mode (a little)
2016-02-09 10:47:30 -08:00
Shishir Mahajan 07184599f7 Tests for PR # 19123: daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-02-09 10:47:31 -05:00
Vincent Demeester b41dba58a0 Fix the since and before filter behavior
Filters should not include stopped container if `-a` is not specified.
Right now, before and since filter are acting as --before and --since
deprecated flags. This commit is fixing that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-02-09 09:26:20 +01:00
Liron Levin df636ef45a Move userns cli test to a separate file, remove experimental flag
Signed-off-by: Liron Levin <liron@twistlock.com>
2016-02-09 09:31:09 +02:00
Stephen Rust c3985bdf79 Fix volume driver API compatibility mode (a little)
Signed-off-by: Stephen Rust <srust@blockbridge.com>
2016-02-08 23:12:29 -05:00
Alexander Morozov 862f073694 Merge pull request #20002 from twistlock/19575_authz_plugin_support_events
Fix 19575: Docker events doesn't work with authorization plugin
2016-02-08 09:10:39 -08:00
Darren Stahl eed648ac5a Fourth set of enabling Builder CI tests for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-05 17:46:06 -08:00
Liron Levin 5ffc810df2 Fix 19575: Docker events doesn't work with authorization plugin
To support the requirement of blocking the request after the daemon
responded the authorization plugin use a `response recorder` that replay
the response after the flow ends.

This commit adds support for commands that hijack the connection and
flushes data via the http.Flusher interface. This resolves the error
with the event endpoint.

Signed-off-by: Liron Levin <liron@twistlock.com>
2016-02-05 22:30:01 +02:00
Darren Stahl 6791230320 Combine SetupWorkingDirectory for Linux and Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-05 10:27:10 -08:00
David Calavera d4c8d0519d Merge pull request #20011 from Microsoft/MinimalBaseImage
Move base image selection to a utility function
2016-02-04 18:06:30 -08:00
Jess Frazelle 2da5ad3bb0 Merge pull request #20005 from Microsoft/jjh/testrunrestartmaxretries
Windows CI: Up timeout TestRunRestartMaxRetries
2016-02-04 16:07:42 -08:00
Darren Stahl 96c5221626 Move base image selection to a utility function
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-04 15:06:34 -08:00
Brian Goff 18204ea616 Merge pull request #19357 from chenchun/internal
Display `internal` flag on `network inspect`
2016-02-04 16:31:12 -05:00
Tibor Vass da58ee42bb Merge pull request #19984 from calavera/vendor_engine_api_master
Vendor engine-api with client context changes.
2016-02-04 16:20:06 -05:00
John Howard 4a2122e020 Windows CI: Up timeout TestRunRestartMaxRetries
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-04 11:59:13 -08:00
David Calavera fe53be4e17 Apply context changes to the client.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-04 13:59:57 -05:00
David Calavera 3329c94e25 Merge pull request #19994 from runcom/fix-test-for-19936
integration-cli: fix minimum and default api version test
2016-02-04 08:33:07 -08:00
Phil Estes 77590d4dae Remove stray printf
This came in with the Windows CI work and I assume was meant for local
debug, but adds a bare printf line to the test output.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-04 10:13:31 -05:00
Antonio Murdaca fe6b88e3fa integration-cli: fix minimum and default api version test
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-04 13:58:08 +01:00
Antonio Murdaca 38e774d32c Merge pull request #19949 from Microsoft/jjh/testapiresize
Windows CI: Port docker_api_resize_test.go
2016-02-04 10:11:32 +01:00
Chun Chen c199506b59 Display `internal` flag on `network inspect`
Also adds internal network tests for bridge network

Signed-off-by: Chun Chen <ramichen@tencent.com>
2016-02-04 15:28:37 +08:00
John Howard 4080ce35e0 Windows CI: Port docker_api_resize_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-03 20:30:06 -08:00
Tibor Vass f0a58947ab Merge pull request #19979 from mavenugo/gccgoci
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
2016-02-03 20:33:52 -05:00
Madhu Venugopal 76a765140e Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-02-03 14:44:55 -08:00
Jess Frazelle fdcce4ac03 Merge pull request #19942 from LK4D4/fix_vet_errors
Fix minor vet warnings
2016-02-03 13:31:11 -08:00
Alexander Morozov 3b80b1947c Merge pull request #19943 from aboch/ec
Store endpoint config on network connect to a stopped container
2016-02-03 11:06:35 -08:00
Alexander Morozov 28a7577a02 Merge pull request #19959 from WeiZhang555/fix-cli-print-err
Remove redundant error message
2016-02-03 10:56:19 -08:00
Alexander Morozov 7a20a270bc Fix minor vet warnings
Also use Asserts where it's possible.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-03 10:43:01 -08:00
Vincent Demeester 382c96ee7b Add a getPrefixAndSlashFromDaemonPlatform …
… to limit code duplication in integration tests :P

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-02-03 15:16:00 +01:00
Vincent Demeester bc08203314 Merge pull request #19948 from Microsoft/jjh/testclirm
Windows CI: Port docker_cli_rm_test.go
2016-02-03 15:05:21 +01:00
Sebastiaan van Stijn 0736dba624 Merge pull request #19947 from Microsoft/jjh/testclistart
Windows CI: Port docker_cli_start_test.go
2016-02-03 13:40:55 +01:00
Vincent Demeester 4ef06e9ef1 Merge pull request #19946 from Microsoft/jjh/stats
Windows: Turn off stats
2016-02-03 09:28:25 +01:00
Zhang Wei 894266c1bb Remove redundant error message
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-03 15:45:20 +08:00
John Howard 6b8341a2d5 Disable flakey TestClientSetsTLSServerName
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 19:56:31 -08:00
John Howard 07fd173225 Windows CI: Port docker_cli_rm_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 18:43:50 -08:00
John Howard b47749102d Windows CI: Port docker_cli_start_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 18:23:29 -08:00
John Howard 55268f4e91 Windows: Turn off stats
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 17:59:11 -08:00
Arnaud Porterie 6f88a3d7d3 Merge pull request #19939 from Microsoft/jjh/testcreate
Windows CI: TestCreate* porting
2016-02-02 17:48:43 -08:00
Alessandro Boch 9b63e4e7f5 Store endpoint config on network connect to a stopped container
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-02-02 17:25:44 -08:00
Alexander Morozov 1bc4c99372 Merge pull request #19761 from HackToday/enhancesortattr
Sort the attributes for events
2016-02-02 16:08:23 -08:00
John Howard 5e3fdd3c20 Windows CI: TestCreate* porting
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 16:00:39 -08:00
Arnaud Porterie 85a32baa3b Merge pull request #19901 from calavera/debug_cli_tests
Always show debug information in the info output
2016-02-02 15:56:55 -08:00
Arnaud Porterie 5ba3edd486 Merge pull request #19915 from wenchma/add_net_bind_test
Add integration test for network host bind option
2016-02-02 15:34:13 -08:00
Alexander Morozov 01cc315322 Merge pull request #19800 from wenchma/19425-TestApiStatsNetworkStats
Optimize TestApiStatsNetworkStats and TestApiStatsNetworkStatsVersioning
2016-02-02 14:56:51 -08:00
David Calavera 9f315dd328 Add regression tests for client debug flag.
- Add client debug info to the `docker info` command.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-02 16:57:36 -05:00
Sebastiaan van Stijn f830cec78a Merge pull request #19868 from HackToday/fixwindows
Fix windows CI test
2016-02-02 19:58:29 +01:00
Arnaud Porterie 7abc7b383c Merge pull request #18605 from fgimenez/9969-add-sni-support
Added cli SNI integration test
2016-02-02 10:12:44 -08:00
Wen Cheng Ma 4f1d876e4c Add integration test for network host bind option
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-02-02 18:01:04 +08:00
Vincent Demeester 5cdc0dfce3 Merge pull request #19822 from Microsoft/jjh/testexeccli
Windows CI: Initial porting CLI TestExec*
2016-02-02 08:32:28 +01:00
Kai Qiang Wu(Kennan) 7ed10d4a4c Fix windows CI test
The windows CI is not clean in some tests, this try address that.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-02 04:54:14 +00:00
Brian Goff a39ad952ec Merge pull request #19889 from Microsoft/jjh/reliabilitytake2
Windows CI: TP4 reliability hack
2016-02-01 22:30:51 -05:00
John Howard 2ebcb48cf1 Windows CI: TP4 reliability hack
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-01 18:02:57 -08:00
David Calavera 898599171e Add test to make sure raw logs are properly activated.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-01 16:52:31 -05:00
Arnaud Porterie a898478a79 Merge pull request #19570 from WeiZhang555/18679-flaky-test
Fix flaky test `TestGetContainerStatsRmRunning`
2016-02-01 13:15:20 -08:00
Brian Goff c28bba0460 Merge pull request #19725 from WeiZhang555/opt-TestRunSeccompDefaultProfile
Optimize `TestRunSeccompDefaultProfile`
2016-02-01 16:01:51 -05:00
David Calavera 0c620d62c2 Merge pull request #19708 from wenchma/19425-TestDaemonCorruptedLogDriverAddress
Optimize slow bottleneck tests of TestDaemonCorruptedLogDriverAddress
2016-02-01 12:59:37 -08:00
David Calavera c19c08b97a Merge pull request #19885 from tophj-ibm/fix-integration-cli-suite-requirements
Fix integration-cli suite setup requirements
2016-02-01 11:13:39 -08:00
John Howard a9379b4af2 Windows CI: Initial porting CLI TestExec*
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-01 10:19:21 -08:00
Sebastiaan van Stijn c2d6831fc4 Merge pull request #19695 from Microsoft/10662-TestBuildCI2
Second set of enabling TestBuild CI for Windows
2016-02-01 16:29:52 +01:00
Wen Cheng Ma 695b7e8d11 Optimize TestApiStatsNetworkStats and TestApiStatsNetworkStatsVersioning
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-02-01 10:26:27 +08:00
Kai Qiang Wu(Kennan) 746f6af9aa Sort the attributes for events
This is add support for #19559
We tried sort it in client side, and it sort follow go
sort : sorts a slice of strings in increasing order.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-01 00:18:33 +00:00
John Howard 59f4369f1a Windows CI: Turn off unreliable TP4 tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-31 15:51:56 -08:00
Zhang Wei 9a9ce80a0f Fix flaky test `TestGetContainerStatsRmRunning`
Remove racey code to fix flaky test

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-31 15:34:22 +08:00
Antonio Murdaca 5f5a752bcf Merge pull request #19847 from Microsoft/jjh/revert19790
Revert PR 19790 (breaks windowsTP4 CI on cache bust)
2016-01-30 20:28:21 +01:00
Federico Gimenez 4ba168b4cb Added cli SNI integration test
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2016-01-30 15:29:24 +01:00
Antonio Murdaca 667c2245ad Merge pull request #19820 from Microsoft/jjh/testexecapi
Windows CI: Port TestExecApi* tests
2016-01-30 11:50:01 +01:00
Antonio Murdaca 98ef10f64e Merge pull request #19839 from Microsoft/jjh/testevents
Windows CI: Porting TestEvents*
2016-01-30 11:47:44 +01:00
John Howard 54320d8d18 Signed-off-by: John Howard <jhoward@microsoft.com>
Revert "Combine SetupWorkingDirectory for Linux and Windows"

This reverts commit ec31741ca1.
2016-01-29 20:49:39 -08:00
Zhang Wei 2e9bb7870a Optimize `TestRunSeccompDefaultProfile`
Optimize performance of `TestRunSeccompDefaultProfile`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-30 10:42:06 +08:00
Brian Goff 9c3cca23e9 Merge pull request #19815 from Microsoft/jjh/testruncreatevolumesinsymlinkdir
Fix TestRunCreateVolumesInSymlinkDir
2016-01-29 21:07:51 -05:00
Christopher Jones d800a4e1ba Fix integration-cli suite setup requirements
This PR moves the testRequires check from within setupRegistry
and setupNotary to when the Suite itself starts up.

This fixes a bug where testRequires() in setupRegistry() would
succeed and start registry, but testRequires() in setupNotary()
would fail. This immediately exits the goroutine with registry
still running.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-01-29 16:35:20 -05:00
David Calavera 35ef3efe9a Merge pull request #19805 from WeiZhang555/test-inspect
Make test code consistent
2016-01-29 12:43:58 -08:00
John Howard bf33742026 Windows CI: Porting TestEvents*
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-29 12:33:56 -08:00
John Howard 90b0292b5b Fix TestRunCreateVolumesInSymlinkDir
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-29 09:28:48 -08:00
Zhang Wei 62a856e912 Assert error in body of function `inspectField*`
1. Replace raw `docker inspect -f xxx` with `inspectField`, to make code
cleaner and more consistent
2. assert the error in function `inspectField*` so we don't need to
assert the return value of it every time, this will make inspect easier.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-29 23:39:07 +08:00
Vincent Demeester 5f63c54192 Merge pull request #19790 from Microsoft/CombineSetupWorkingDir
Combine SetupWorkingDirectory for Linux and Windows
2016-01-29 08:52:08 +01:00
Sebastiaan van Stijn 7d13f2fb7d Merge pull request #19563 from Microsoft/10662-TestBuildCI1
First batch of Windows-Windows TestBuild CI enabling
2016-01-28 17:13:45 -08:00
John Howard 9642c8170a Windows CI: Port TestExecApi* tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-28 16:26:06 -08:00
Darren Stahl 2b95f012db Second set of enabling TestBuild CI for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-01-28 13:43:22 -08:00
Darren Stahl 87839b345e Temporarily removing TestBuildHistory on Windows for perf reasons
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-01-28 13:42:02 -08:00
Darren Stahl ec31741ca1 Combine SetupWorkingDirectory for Linux and Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-01-27 16:17:35 -08:00
David Calavera 0f5aa19593 Merge pull request #19767 from icecrime/factorize_sleeping_container
Factorize sleeping containers
2016-01-27 13:42:56 -08:00
Jess Frazelle c39c7e6edf Merge pull request #19760 from cyli/re-vendor-notary
Re-vendor Notary and docker/go
2016-01-27 09:36:26 -08:00
Arnaud Porterie 777ee34b07 Factorize sleeping containers
Add `runSleepingContainer` and `runSleepingContainerInImage` helper
functions to factor out the way to run system-specific idle containers.

Define a sleeping container as command `top` in image `busybox` for
Unix and as command `sleep 60` in image `busybox` for Windows. Provide a
single point of code to update those.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-01-27 08:48:08 -08:00
Antonio Murdaca c1b168664f Merge pull request #19764 from Microsoft/jjh/testinspectapi
Windows CI: PortTestInspectApi*
2016-01-27 14:08:28 +01:00
John Howard 3c61f00616 Windows CI: PortTestInspectApi*
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 20:23:40 -08:00
John Howard 916b9db71d Windows CI: Darn it, I broke due to multiple declarations
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 19:58:53 -08:00
Sebastiaan van Stijn 3cf4884787 Merge pull request #19612 from Microsoft/jjh/apicontainerstest
Windows CI: Fixup docker_api_containers_test.go
2016-01-26 19:14:43 -08:00
Arnaud Porterie 603c04a789 Merge pull request #19744 from Microsoft/jjh/testhistory
Windows CI: Enable TestHistory* cli tests
2016-01-26 19:08:33 -08:00
Arnaud Porterie 864cca2287 Merge pull request #19605 from Microsoft/jjh/docker_api_images_test
Windows CI: Porting for docker_api_images_test.go
2016-01-26 19:04:25 -08:00
Arnaud Porterie 70c5e96cb8 Merge pull request #19604 from Microsoft/jjh/testrename
Windows CI: Fix TestRename*
2016-01-26 19:03:31 -08:00
Arnaud Porterie 51d4d8eff2 Merge pull request #19603 from Microsoft/jjh/testps
Windows CI: Address simple failures in TestPS*
2016-01-26 19:01:17 -08:00
Doug Davis 9b82174f93 Merge pull request #19742 from Microsoft/jjh/testrmi
Windows CI: Port TestRmi tests
2016-01-26 21:46:35 -05:00
cyli 0617521ba2 Update integration tests with new error messages, and to use different repos per test.
This way we won't encounter any problems with one test using cached data from a different
test.

Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-01-26 18:02:00 -08:00
Brian Goff 146e49b039 Merge pull request #19671 from calavera/volume-dangling
Make volume dangling filter return only used volumes with `dangling=false`.
2016-01-26 17:01:20 -05:00
Antonio Murdaca 0b248e88ff Merge pull request #19734 from Microsoft/jjh/testtag
Windows CI: Port TestTag* cli tests
2016-01-26 22:56:36 +01:00
Tibor Vass 4adb0fb310 Merge pull request #19723 from bboreham/not-preferred
Stop referring to requested IP address as "preferred"
2016-01-26 13:46:09 -08:00
John Howard 15c32f39a9 Windows CI: Enable TestHistory* cli tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 12:42:09 -08:00
John Howard 94e5fab5ed Windows CI: Port TestRmi tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 12:22:37 -08:00
Darren Stahl 563a4d1b9f First batch of Windows-Windows TestBuild CI enabling
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-01-26 12:15:13 -08:00
John Howard 1723c6477f Windows CI: Port TestTag* cli tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 10:41:31 -08:00
Jess Frazelle c56e309d05 Merge pull request #19712 from runcom/test-requires-apparmor
integration-cli: require Apparmor
2016-01-26 09:18:29 -08:00
Arnaud Porterie 269a6d7d36 Merge pull request #19705 from mavenugo/18222
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
2016-01-26 09:16:57 -08:00
Arnaud Porterie 7a97e938e2 Merge pull request #19490 from cyphar/remove-dockerinit
Remove dockerinit once and for all
2016-01-26 08:27:35 -08:00
Bryan Boreham 7126ecd0ad Stop referring to requested IP address as "preferred",
since it is an error if that address is unavailable.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2016-01-26 15:13:26 +00:00
Doug Davis fc8e344297 Merge pull request #19715 from coolljt0725/fix_test_daemon
Test utils: fix daemon start utils
2016-01-26 10:08:50 -05:00
Doug Davis e5b5c0ebe8 Merge pull request #19713 from WeiZhang555/opt-TestEventsContainerFailStartDie
Optimize `TestEventsContainerFailStartDie`
2016-01-26 09:32:52 -05:00
Lei Jitang e88258ca2e Test utils: fix daemon start utils
User call `Start` could with args, and the args could
contains `--storage-driver`, but in `Start`, it will add
`--storage-driver` even though user has specified `--storage-driver`
in args.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-26 08:31:50 -05:00
Aleksa Sarai 4357ed4a73 *: purge dockerinit from source code
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
2016-01-26 23:47:02 +11:00
Madhu Venugopal e38463b277 Move port-mapping ownership closer to Sandbox (from Endpoint)
https://github.com/docker/libnetwork/pull/810 provides the more complete
solution for moving the Port-mapping ownership away from endpoint and
into Sandbox. But, this PR makes the best use of existing libnetwork
design and get a step closer to the gaol.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-26 03:59:03 -08:00
Zhang Wei 4f7dda3fb2 Optimize `TestEventsContainerFailStartDie`
Optimize performance of `TestEventsContainerFailStartDie`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-26 19:23:18 +08:00
Antonio Murdaca 7ac8c77877 integration-cli: require Apparmor
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-26 11:57:14 +01:00
Vincent Demeester 613e91f36f Merge pull request #19703 from mountkin/speedup-TestEventsAttach
optimize DockerSuite.TestEventsAttach
2016-01-26 11:41:31 +01:00
Wen Cheng Ma 07d2c31810 Optimize slow bottleneck tests of TestDaemonCorruptedLogDriverAddress
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-26 14:53:10 +08:00
Shijiang Wei 77a0f77e7f optimize DockerSuite.TestEventsAttach
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-01-26 10:45:45 +08:00
Tibor Vass 58c2488d07 Merge pull request #19568 from cpuguy83/17907_fix_rmv
On container rm, don't remove named mountpoints
2016-01-25 18:13:57 -08:00
Tibor Vass 2cb8fdd327 Merge pull request #19673 from aboch/epcs
Save endpoint config only if endpoint creation succeeds
2016-01-25 16:50:47 -08:00
Tibor Vass f7abff4f81 Merge pull request #19560 from aboch/mn
Reject multiple networks on container creation request
2016-01-25 14:57:51 -08:00
Antonio Murdaca 0f0c35960f Merge pull request #19674 from tonistiigi/19652-fix-create-error-message
Fix error message in container creation
2016-01-25 23:47:57 +01:00
David Calavera cf44f17258 Merge pull request #19619 from WeiZhang555/test-bottleneck-oomtrue
Optimize TestEventsOOMDisableTrue
2016-01-25 14:24:46 -08:00
Sebastiaan van Stijn 156e2f0e5c Merge pull request #19555 from hypriot/update-registry-on-dockerfile-armhf
Update registry version in Dockerfile.armhf
2016-01-25 14:14:00 -08:00
Tibor Vass 268a20af95 Merge pull request #19528 from cpuguy83/19475_abck_compat_for_vol_drivers
Add back compat for volume drivers `Get` and `Ls`
2016-01-25 13:53:51 -08:00
Alessandro Boch 733245b2e7 Save endpoint config only if endpoint creation succeeds
- Currently it is being save upfront...

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-25 13:43:32 -08:00
David Calavera 1431b623a4 Make volume dangling filter return only used volumes with `dangling=false`.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-25 16:26:51 -05:00
Brian Goff dd7d1c8a02 On container rm, don't remove named mountpoints
This makes it so when calling `docker run --rm`, or `docker rm -v`, only
volumes specified without a name, e.g. `docker run -v /foo` instead of
`docker run -v awesome:/foo` are removed.

Note that all volumes are named, some are named by the user, some get a
generated name. This is specifically about how the volume was specified
on `run`, assuming that if the user specified it with a name they expect
it to persist after the container is cleaned up.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-25 15:51:28 -05:00
Alessandro Boch cfa515fd9d Reject multiple networks on container creation
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-25 12:50:01 -08:00
Tonis Tiigi 8a68315c38 Fix error message in container creation
Error message was different if image was specified with the full ID.

Fixes #19652

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-01-25 11:45:20 -08:00
David Calavera 15cc67b73d Merge pull request #19615 from runcom/add-registry-with-auth-testsuite
integration-cli: add suite for testing registries with auth
2016-01-25 11:12:16 -08:00
Brian Goff 997e61add9 Merge pull request #19658 from wenchma/19425-daemon_ipv6
Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR
2016-01-25 14:04:54 -05:00
Zhang Wei 6bf5b3db9a Optimize slow integration test
Optimize `TestEventsOOMDisableTrue` performance

It's part of #19425 issue.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-26 00:07:20 +08:00
Shijiang Wei c983996e0b speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-01-25 23:45:13 +08:00
Wen Cheng Ma 73849a5c82 Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR and TestDaemonIPv6FixedCIDRAndMac
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-25 23:43:49 +08:00
Zhang Wei e151ad936a Make test case name consistent
Replace `Tty` with `TTY` in all test case names so that we can run
a bundle of `TTY` related test cases with TESTFLAGS like
`-check.f TestExecTTY*`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-24 16:32:52 +08:00
Sebastiaan van Stijn 717ced8dd7 Merge pull request #19602 from Microsoft/jjh/testrunexitonstdinclose
Windows CI: Fix TestRunExitOnStdinClose flakiness
2016-01-23 18:53:28 -08:00
John Howard 75d107451a Windows CI: Address simple failures in TestPS*
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-23 16:33:45 -08:00
Antonio Murdaca 011b4f01f4 integration-cli: add suite for testing registries with auth
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-24 01:02:49 +01:00
John Howard 2b0a742237 Windows CI: Fix api_containers_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-23 14:40:25 -08:00
Stefan Scherer 11a51649cf Update registry version in Dockerfile.armhf
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-23 18:46:46 +01:00
John Howard f21fb2162e Windows CI: Fix TestRename*
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-23 09:25:10 -08:00
John Howard 80b0570671 Windows CI: Porting for docker_api_images_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-22 21:13:38 -08:00