Commit Graph

2906 Commits

Author SHA1 Message Date
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
Alexander Morozov 7be8f72644 Merge pull request #19600 from aaronlehmann/buildenvusage2
Slight TestBuildEnvUsage2 speedup
2016-01-22 20:38:45 -08:00
Brian Goff f6c20d9b22 Add back compat for volume drivers `Get` and `Ls`
Use a back-compat struct to handle listing volumes for volumes we know
about (because, presumably, they are being used by a container) for
volume drivers which don't yet support `List`.

Adds a fall-back for the volume driver `Get` call, which will use
`Create` when the driver returns a `404` for `Get`. The old behavior was
to always use `Create` to get a volume reference.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-22 22:48:17 -05:00
John Howard 4bfc5d4606 Windows CI: Fix TestRunExitOnStdinClose
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-22 18:27:15 -08:00
Aaron Lehmann 74fafa5dd2 Slight TestBuildEnvUsage2 speedup
TestBuildEnvUsage2 was flagged in https://github.com/docker/docker/issues/19425
as one of the slowest integration tests. It's slow because it has some
comprehensive builder test cases that end up creating a lot of layers.
Even with a busybox base image, this can be expensive. It's not possible
to build "FROM scratch" because the test cases need the shell to ensure
environment variables are set correctly.

Some of the ENV and RUN statements can be combined. This causes fewer
layers to get created. Doing this produces a marginal improvement in the
runtime.

Before:

    PASS: docker_cli_build_test.go:3956: DockerSuite.TestBuildEnvUsage2 43.619s

After:

    PASS: docker_cli_build_test.go:3956: DockerSuite.TestBuildEnvUsage2 31.286s

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-22 17:13:50 -08:00
Sebastiaan van Stijn 6d1455e74b Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer
Hotfix vendor libcontainer
2016-01-22 16:46:04 -08:00
Brian Goff feca36b379 Merge pull request #19519 from calavera/fix_event_channel_closing_race
Fix channel closing race in event tests.
2016-01-22 19:43:28 -05:00
David Calavera 422827fa92 Merge pull request #19527 from aboch/epc
Move Unsupp Network & IP check to the new updateNetworkConfig() func
2016-01-22 15:54:21 -08:00
Antonio Murdaca 504a8ad295 Merge pull request #19567 from Microsoft/jjh/testpsnotshowportsofstoppedcontainer
Windows: TestPsNotShowPortsOfStoppedContainer linux only
2016-01-22 21:53:31 +01:00
Brian Goff 455a505749 Merge pull request #19190 from srust/volume_driver_parity_again
Allow external volume drivers to host anonymous volumes again
2016-01-22 15:53:06 -05:00
Tibor Vass 2731dbc797 Merge pull request #19509 from BrianBland/master
Fixes layer MediaTypes in manifests created from a cross-repository push
2016-01-22 14:27:47 -05:00
David Calavera 27b060492c Fix channel closing race in event tests.
Divide event matching into two functions, a matcher and
a processor. That way, the error handling doesn't call
the channel closing logic at all.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-22 13:31:46 -05:00
Tibor Vass a9fc4939df Merge pull request #19573 from sanimej/libn
Vendor in libnetwork v0.6.0-rc2
2016-01-22 12:07:40 -05:00
Tibor Vass cba7ba25f4 Merge pull request #19488 from hypriot/enable-docker-trust-suite-on-arm
Enable DockerTrustSuite for ARM again
2016-01-22 11:23:19 -05:00
Aleksa Sarai cc19c7df2a integration-cli: add bad --cgroup-parent tests
To ensure we don't regress on bad --cgroup-parent paths, add some
integration tests that check that the host hasn't toppled (or suddently
started to create files in the host).

Signed-off-by: Aleksa Sarai <asarai@suse.com>
2016-01-22 20:16:56 +11:00
Santhosh Manohar da9eadb066 IT for service/network name with '.', corrected libnetwork flag for DNS
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-21 20:49:02 -08:00
John Howard 845dc1b24c Windows: TestPsNotShowPortsOfStoppedContainer linux only
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-21 18:48:21 -08:00
Morgan Bauer bcb9adf49e
check the output, not the errcode
- errcode of 1 can be returned for cases other than the 'no space left' case

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-01-21 15:23:20 -08:00
Alessandro Boch 3b0d36dbc1 Move ErrUnsupportedNetwork* checks to updateNetworkConfig() func
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-21 10:56:01 -08:00
John Howard 473a32ba8f Windows: Fix TestLinksMultipleWithSameName
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-21 09:52:49 -08:00
Vincent Demeester 476edba011 Merge pull request #19483 from coolljt0725/fix_19477
Fix #19477, clean up the ports when release network
2016-01-21 14:29:29 +01:00
Wen Cheng Ma 2e6b1eb309 Fixes the typo of docker_cli_network_unix_test.go
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-21 16:37:17 +08:00
Lei Jitang 6025517b68 Fix #19477, clean up the ports when release network
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-20 20:09:11 -05:00
Lei Jitang bb8d8a645a Merge pull request #19430 from keloyang/StatsNoStreamGetCpu
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
2016-01-21 09:07:00 +08:00
David Calavera ee001d87a9 Merge pull request #19514 from cpuguy83/19444_fix_links_with_same_name
Don't error out when link name in use.
2016-01-20 15:21:58 -08:00
Brian Goff 332d95fd0d Don't error out when link name in use.
This preserves old behavior from sqlite links/names.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-20 16:40:56 -05:00
Brian Bland 06e9a056ca Fixes layer MediaTypes in manifests created from a cross-repository push
Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-20 12:23:16 -08:00
David Calavera fd79462af3 Merge pull request #19044 from HackToday/18890-validate-volume
Fix volume filter validation
2016-01-20 09:56:30 -08:00
Stefan Scherer acb42c5fab Enable DockerTrustSuite for ARM again
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-20 14:58:09 +01:00
Vincent Demeester 87b7ff5267 Merge pull request #19465 from mavenugo/sysd
Vendor libnetwork v0.6.0-rc1
2016-01-20 09:02:21 +01:00
Sebastiaan van Stijn 910a5fc234 Fix DockerTrustSuite SetUpTest
This hopefully makes DockerTrustSuite.SetUpTest
less flaky.

Increased the number of attempts to check
if Notary is available before giving up.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-19 16:45:47 -08:00
Madhu Venugopal 8799218d01 IT for remote network driver & ungraceful restart
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-19 14:09:11 -08:00
Christopher Jones d12f4babdd Fix test requirement for ARM
Correctly passes the DOCKER_ENGINE_GOARCH env var
to the testing environment

Also fixes logic for skipping a test if on ARM.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-01-19 15:23:46 -05:00
Antonio Murdaca 167cc42986 api: client: build: do not fall through if git isn't installed
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-19 16:50:14 +01:00
Tibor Vass e8ce350669 Merge pull request #19424 from aaronlehmann/revert-multiple-pull-errors
Revert reporting of multiple pull errors
2016-01-19 09:51:54 -05:00
Lei Jitang 42ee908b3f Merge pull request #19431 from WeiZhang555/19422-default-network
bugfix: prevent creating network 'default'
2016-01-19 14:18:20 +08:00
yangshukui d474f7fb86 remove the check of ContentLength in TestApiStatsNoStreamGetCpu
Signed-off-by: yangshukui <yangshukui@huawei.com>
2016-01-19 12:06:01 +08:00
Zhang Wei 31dae442c8 bugfix: prevent creating network 'default'
Default is predefined network and is reserved, so we should stop user
from creating network with name `default`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-19 11:06:36 +08:00
Aaron Lehmann 87338bf0fa Revert reporting of multiple pull errors
Revert the portions of #17617 that report all errors when a pull
falls back, and go back to just reporting the last error. This was nice
to have, but causes some UX issues because nonexistent images show
additional "unauthorized" errors.

Keep the part of the PR that handled ENOSPC, as this appears to work
even without tracking multiple errors.

Fixes #19419

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-18 15:49:08 -08:00
Stefan Scherer 4f339570cb Skip failing tests on ARM to get red/green feedback from Jenkins
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-18 17:00:15 +01:00
Kai Qiang Wu(Kennan) 66c253cbf7 Fix volume filter validation
Fixes: #18890
This fix add same filter validation logic as images. We should
add such check to make sure filters work make sense to end-users

Right now, we keep old use 1 as filter, but in long term, it should
be have same interface checking as images, it could be improved in
other patches.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-18 10:07:42 +00:00
Sebastiaan van Stijn f1c6cd57fa Merge pull request #19320 from cilium-team/fixing-inspect-api-container-volume-driver
Fixing TestInspectApiContainerVolumeDriver
2016-01-16 01:04:32 -08:00
Phil Estes bc13e4a99e Merge pull request #19369 from cpuguy83/19362_fix_exec_panic
Fix panic on starting exec more than once
2016-01-15 15:17:52 -05:00
David Calavera b63b43dc4c Merge pull request #19219 from runcom/add-log
integration-cli: log error when starting registry
2016-01-15 09:44:47 -08:00
Brian Goff 1a60a805bf Fix panic on starting exec more than once
Issue was caused when exec is tarted, exits, then stated again.
In this case, `Close` is called twice, which closes a channel twice.

Changes execConfig.ExitCode to a pointer so we can test if the it has
been set or not.
This allows us to return early when the exec has already been run.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-15 11:57:23 -05:00
Jess Frazelle 4c89b1f72c Merge pull request #19355 from riyazdf/notary-revendor
notary revendor into docker
2016-01-15 01:02:35 -08:00
Antonio Murdaca bca9415b52 Merge pull request #19356 from sanimej/restart
Vendoring libnetwork v0.5.6
2016-01-15 09:32:53 +01:00
Riyaz Faizullabhoy dd7436c832 revendor notary and wrap friendlier error messages
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-01-14 20:35:59 -08:00
Wen Cheng Ma 5cc672b006 Add Subnets info for user-defined network
* If user doesn't specify the subnets to create a network, it will pick
  subnets from inside preferred pool. This PR aims to inspect these subnets info

* Add integration tests for docker inspect the subnets.

* docker-py project is already synchronized.

* jenkins checks depend on https://github.com/docker/docker-py/pull/888

Fixes issue #18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-15 10:03:29 +08:00
Sebastiaan van Stijn e44364eae9 Merge pull request #18587 from calavera/daemon_configuration_file
Allow to set daemon and server configurations in a file.
2016-01-14 16:44:58 -08:00
Tibor Vass 94b2d56690 Merge pull request #19109 from BrianBland/crossRepositoryPush
Cross repository push
2016-01-14 18:50:53 -05:00
Brian Bland 6309947718 Changes cross-repository blob mounting to a blob Create option
Also renames BlobSumService to V2MetadataService, BlobSum to
V2Metadata

Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-14 14:26:03 -08:00
David Calavera 677a6b3506 Allow to set daemon and server configurations in a file.
Read configuration after flags making this the priority:

1- Apply configuration from file.
2- Apply configuration from flags.

Reload configuration when a signal is received, USR2 in Linux:

- Reload router if the debug configuration changes.
- Reload daemon labels.
- Reload cluster discovery.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-14 16:44:37 -05:00
Tibor Vass e35f5a481a Merge pull request #17316 from rmb938/ipam_conf_options
Add IPAM Config Options to match libnetwork
2016-01-14 16:30:03 -05:00
John Howard d3392a3bde Windows: Fix test regression from 19155
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-14 12:00:27 -08:00
Ryan Belgrave 662cac08ef Add IPAM Config Options to match libnetwork
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-14 14:32:25 -05:00
Madhu Venugopal 7481961009 IT for restart-policy and DNS based SD in user-defined networks
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-14 11:03:26 -08:00
Brian Goff 7cd6210a88 Merge pull request #19326 from HackToday/19153-filter-rethink
Fix image filter
2016-01-14 13:59:14 -05:00
David Calavera 73a5393bf3 Merge pull request #19242 from mavenugo/nsalias
Network scoped alias support
2016-01-14 10:58:51 -08:00
David Calavera 812d95cdfb Merge pull request #19323 from wenchma/19089-add_network_id
Add network ID to container inspect
2016-01-14 09:58:24 -08:00
David Calavera a225e39667 Merge pull request #19155 from coolljt0725/create_cwd_on_create
Create the working directory on container creation
2016-01-14 09:13:44 -08:00
Madhu Venugopal dda513ef65 Network scoped alias support
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-14 08:44:41 -08:00
Tibor Vass 349d9700bd Merge pull request #19291 from coolljt0725/fix_19100
Fix #19100 and fix a typo
2016-01-14 11:40:29 -05:00
Wen Cheng Ma 9f676ade0a Add network ID to container inspect
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-14 22:33:41 +08:00
Kai Qiang Wu(Kennan) 5ee69eb470 Fix image filter
This is related image fix for Propose #19153
for volume related change, would use another patch
to fix that.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-14 08:17:40 +00:00
Lei Jitang 3d2539d39d Fix #19100 and fix a typo
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-14 14:58:54 +08:00
Madhu Venugopal b464f1d78c Forced endpoint cleanup
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-13 21:28:52 -08:00
André Martins 693b5c4298 Fixing TestInspectApiContainerVolumeDriver
Currently the TestInspectApiContainerVolumeDriver is testing the
existence of a volume driver without specifing any volume driver.
This commit fixes that.

Signed-off-by: André Martins <aanm90@gmail.com>
2016-01-14 03:22:53 +00:00
David Calavera db1d5f7ea3 Add test to verify that response hijacking always works over TLS.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-13 20:18:06 -05:00
Brian Bland 7289c7218e Adds cross-repository blob pushing behavior
Tracks source repository information for each blob in the blobsum
service, which is then used to attempt to mount blobs from another
repository when pushing instead of having to re-push blobs to the same
registry.

Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-13 14:26:30 -08:00
Tibor Vass 612cf0f172 Merge pull request #19279 from tiborvass/rename-authz-to-authorization
Rename authz to authorization for greater clarity
2016-01-13 14:30:18 -05:00
Tibor Vass 5c630ea7c3 Rename authz to authorization for greater clarity
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-13 14:15:37 -05:00
Antonio Murdaca 11a95b9514 integration-cli: check nil before Close'ing
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-13 13:36:45 +01:00
Antonio Murdaca a79f96828f Merge pull request #19249 from calavera/carry_17414
[Carry 17414] Added additional container information to "docker info".
2016-01-13 10:42:22 +01:00
Sebastiaan van Stijn 47d87d3b92 Merge pull request #19229 from mavenugo/udlinks
Local alias support
2016-01-12 16:47:32 -08:00
Tibor Vass 1e1a3c9508 Merge pull request #19266 from tonistiigi/fix-untag-on-rmi-by-id
Fix rmi by ID untagging image on error
2016-01-12 18:56:25 -05:00
David Calavera c0c66c57b2 Merge pull request #19170 from aaronlehmann/delete-prune-digests
Prune digest references when deleting by tag
2016-01-12 15:15:36 -08:00
Tonis Tiigi 38a45eed88 Fix rmi by ID untagging image on error
Do not untag image if it would later get a hard conflict because of running containers.

Fixes #18873

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-01-12 13:45:40 -08:00
Madhu Venugopal e221b8a3d6 Support `--link` for user-defined networks
This brings in the container-local alias functionality for containers
connected to u ser-defined networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 13:38:48 -08:00
Aaron Lehmann 2f048f73e1 Prune digest references when deleting by tag
When pulling an image with content trust enabled, two references are
created: a digest reference and a tag reference. Deleting by tag
wouldn't actually remove the image, because the digest reference keeps
it alive.

This change modifies the rmi logic so that digest references don't keep
an image alive. If the last tag referencing a given image is deleted,
any digest references to it will be removed as well, so the image can
actually get deleted. This fixes the usability problem with deletions
when content trust is in use, so something like "docker pull busybox;
docker rmi busybox" will work as expected.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-12 12:11:43 -08:00
Jess Frazelle 293b3767c8 Merge pull request #19245 from jfrazelle/seccomp-kernel-check
check seccomp is configured in the kernel
2016-01-12 11:33:27 -08:00
Jessica Frazelle 40d5ced9d0
check seccomp is configured in the kernel
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-12 09:45:21 -08:00
Sebastiaan van Stijn c72be040bb Merge pull request #19187 from estesp/lets-do-this
User namespaces: graduate from experimental
2016-01-12 09:34:19 -08:00
Sebastiaan van Stijn 301627c677 Merge pull request #18906 from coolljt0725/connect_to_created
Support network connect/disconnect to stopped container
2016-01-12 07:06:31 -08:00
Lei Jitang 79d4f0f56e Add docker network connect/disconnect to non-running container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-11 20:13:39 -05:00
Kim Eik e732f4e649 Added additional container information to "docker info".
Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.

Signed-off-by: Kim Eik <kim@heldig.org>
(cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)
2016-01-11 19:14:44 -05:00
Jess Frazelle 9c9a1d1b4b Merge pull request #19069 from jfrazelle/apparmor-regex-proc
fix proc regex
2016-01-11 13:50:25 -08:00
Arnaud Porterie f11b6a2ab3 Merge pull request #18785 from aaronlehmann/new-manifest
New image manifest format
2016-01-11 12:01:46 -08:00
Antonio Murdaca 55cec657bb integration-cli: log error when starting registry
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-11 20:16:13 +01:00
Alexander Morozov 9a23569ecf Merge pull request #16032 from cpuguy83/remove_sqlite_dep
Build names and links at runtime - no more sqlite
2016-01-11 10:59:49 -08:00
Sebastiaan van Stijn 967acd56c1 Merge pull request #18512 from euank/18510-fixOomKilled
Set OOMKilled state on any OOM event
2016-01-11 00:09:26 +01:00
Vincent Demeester 6175add0e1 Merge pull request #19193 from Microsoft/jjh/networkapitests
Windows CI: Turn off network API tests
2016-01-10 21:18:21 +01:00
Sebastiaan van Stijn 38f4217bff Merge pull request #19195 from Microsoft/jjh/wincifailingtests
Windows CI: Deal with failing tests for TP4
2016-01-10 21:18:02 +01:00
Vincent Demeester 7b1caafe27 Merge pull request #19205 from runcom/fix-formats
integration-cli: fix wrong formats
2016-01-10 20:53:11 +01:00
Antonio Murdaca 5fe38d39e7 integration-cli: fix wrong formats
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-09 11:44:15 +01:00
Aaron Lehmann ad6c1b7649 Add integration test for pulling a manifest list
The test injects a synthetic manifest list into the registry blob store,
since there isn't a tool for pushing them yet.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-08 17:27:31 -08:00
Aaron Lehmann 1fa2e31151 Build a pre-schema2 registry to test schema1 push/pull
Add DockerSchema1RegistrySuite which uses this registry, and make
applicable integration tests run as part of this suite.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-08 17:27:31 -08:00
Euan ba19b6927f Increase integration cli test memory
Signed-off-by: Euan <euank@amazon.com>
2016-01-08 23:10:31 +00:00
Santhosh Manohar 64a6dc3558 Docker changes for libnetwork vendoring..
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-08 14:13:55 -08:00
Alexander Morozov 807d575b5e Merge pull request #19135 from Microsoft/jjh/securitywarning
Windows: Fix security warning regression
2016-01-08 13:55:41 -08:00
John Howard 25c383391a Windows CI: Deal with failing tests for TP4
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-08 13:49:43 -08:00