2210b15e08
Fix format string in TestExecApiCreateContainerPaused
...
It was s% instead of %s.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-17 11:05:51 -08:00
337ee2aa63
integration-cli: use Devicemapper test requirement instead of checking strings
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-17 18:18:18 +01:00
60ffd6c880
Make volume ls output order
...
Fixes : #20384
Add order support for volume ls to make it easy
to external users to consume.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-17 09:01:27 +00:00
5c78515430
Merge pull request #20366 from LK4D4/socks_proxy
...
Add support for forwarding Docker client through SOCKS proxy
2016-02-16 22:29:49 -08:00
838ed1866b
Make network ls output order
...
Fixes : #20328
We sort network ls output with incresing order,
it may make output more easy to consume for users.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-17 04:35:36 +00:00
46e41dc2f8
Require linux for TestExecAfterContainerRestart
...
All the other exec tests require linux except this one and it is
causing failures in the TP4 test runs.
ref:
https://jenkins.dockerproject.org/job/Docker-PRs-WoW-TP4/1076/console
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-02-16 17:50:50 -08:00
eae59c4226
Merge pull request #20374 from icecrime/20357_test_logs_since_future_follow
...
Fix flaky TestLogsSinceFutureFollow
2016-02-16 15:23:19 -08:00
4928121992
Fix flaky TestLogsSinceFutureFollow
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-16 13:49:44 -08:00
e1c2eb0d35
Fix docker import on compressed data
...
Fixes #20296
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-02-16 11:19:23 -08:00
05002c2501
Add support for forwarding Docker client through SOCKS proxy
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-16 11:09:28 -08:00
5fc0de2688
Sixth set of TestBuild CI Enabling for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-13 20:54:59 -08:00
5a9a435d40
Merge pull request #20290 from calavera/fix_stop_signal_merge
...
Inherit StopSignal from Dockerfile.
2016-02-13 09:26:11 +01:00
79edcc5172
Merge pull request #20198 from cpuguy83/check_drivers_b4_vol_create
...
Check drivers before vol create
2016-02-12 18:41:48 -05:00
64a4605892
Merge pull request #20278 from aaronlehmann/build-authconfig
...
Pass authentication credentials through to build
2016-02-12 18:37:49 -05:00
a252516ec1
Inherit StopSignal from Dockerfile.
...
Make sure the image configuration is not overriden by the default
value in the `create` flag.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-12 17:56:40 -05:00
6fed46aeb9
Pass authentication credentials through to build
...
In Docker 1.10 and earlier, "docker build" can do a build FROM a private
repository that hasn't yet been pulled. This doesn't work on master. I
bisected this to https://github.com/docker/docker/pull/19414 .
AuthConfigs is deserialized from the HTTP request, but not included in
the builder options.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-12 10:50:16 -08:00
fffff202fc
Merge pull request #20261 from tophj-ibm/change-test-to-use-variable
...
Change integration test to use declared variable
2016-02-12 07:52:51 -08:00
3723013a1f
Merge pull request #20256 from jfrazelle/make-tests-faster
...
make tests faster no apt-key
2016-02-11 22:01:13 -05:00
ce1059973a
Change integration test to use variable
...
Followup to #20246 , changes the test to use already declared variable
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-02-11 21:20:00 -05:00
5ca6d3bafd
Merge pull request #20250 from vieux/fix_misspell
...
fix common misspells
2016-02-11 17:22:06 -08:00
0d02f2a011
make tests faster no apt-key
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-11 16:28:00 -08:00
46ec01bd12
Merge pull request #20246 from tophj-ibm/19368-fix-flaky-network-test
...
Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart
2016-02-11 15:50:40 -08:00
99a396902f
fix common misspell
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 15:49:36 -08:00
dfb00652aa
Expose bridge IPv6 setting to `docker network inspect`
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2016-02-11 22:13:47 +00:00
4cdd0403cd
Merge pull request #20218 from icecrime/fix_remote_integration-cli
...
Improve remote integration-cli tests
2016-02-11 22:51:20 +01:00
045aee2002
Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart
...
Fixes #19368 by waiting until all container statuses are running
before killing the daemon
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-02-11 16:47:40 -05:00
acd8baccff
Merge pull request #20209 from aaronlehmann/upper-case-hostnames
...
Allow uppercase characters in image reference hostname
2016-02-11 10:50:05 -05:00
a943c40150
Improve remote integration-cli tests
...
Progress toward being able to run integration-cli campaign using a
client hitting a remote host.
Most of these fixes imply flagging tests that assume they are running on
the same host than the Daemon. Also fixes the `contrib/httpserver` image
that couldn't run because of a dynamically linked Go binary inside the
busybox image.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-11 07:31:49 -08:00
3403a01b07
Remove back-compat hacks from for volume plugins.
...
Hacks were added as interim support for 1.10 but should not be needed
for 1.11.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-10 20:43:20 -05:00
00ec6102d9
Probe all drivers if volume driver not specified
...
This fixes an issue where `docker run -v foo:/bar --volume-driver
<remote driver>` -> daemon restart -> `docker run -v foo:/bar` would
make a `local` volume after the restart instead of using the existing
volume from the remote driver.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-10 20:43:15 -05:00
9be87be582
Merge pull request #20170 from Microsoft/10662-TestBuildCI5
...
Fifth set of TestBuild CI enables for Windows
2016-02-10 16:02:26 -08:00
e2afab9c4a
Allow uppercase characters in image reference hostname
...
This PR makes restores the pre-Docker 1.10 behavior of allowing
uppercase characters in registry hostnames.
Note that this only applies to hostnames, not remote image names.
Previous versions also prohibited uppercase letters after the hostname,
but Docker 1.10 extended this to the hostname itself.
- Vendor updated docker/distribution.
- Add a check to "normalize" that rejects remote names with uppercase
letters.
- Add test cases to TestTagValidPrefixedRepo and
TestTagInvalidUnprefixedRepo
Fixes : #20056
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-10 14:03:41 -08:00
ab0102d671
Merge pull request #19814 from Microsoft/10662-TestBuildCI3
...
Third set of TestBuild* CI enabling for Windows
2016-02-10 21:49:39 +01:00
0adcce10a1
Fifth set of TestBuild CI enables for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-10 12:37:58 -08:00
7e44d0ca58
Merge pull request #20183 from hypriot/fix-20002-for-multiarch
...
Fix TestAuthZPluginAllowEventStream for multiarch
2016-02-10 09:42:35 -05:00
cfa806378e
Merge pull request #20174 from tophj-ibm/remove-power-from-logrus-tests
...
PPC64LE: Remove testing logrus output from ppc64le
2016-02-10 09:07:47 -05:00
36a974a1a6
Fix TestAuthZPluginAllowEventStream for multiarch
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-02-10 07:28:50 +01:00
61efb4d084
Merge pull request #20135 from vdemeester/20087-fix-since-before-filters
...
Fix the since and before filter behavior
2016-02-09 21:13:00 -05:00
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
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
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
d6870238e3
Merge pull request #19985 from Microsoft/CombineSetupWorkingDir
...
Combine SetupWorkingDirectory for Linux and Windows
2016-02-09 15:18:49 -08:00
b3cb0d196d
Merge pull request #18943 from cpuguy83/fix_write_flusher
...
Remove Exists from backend
2016-02-09 15:16:03 -08:00
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
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
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
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
3434860d54
Fix horribly broken TestGetContainerStatsNoStream
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-09 14:25:05 -05:00
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
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
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
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
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
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
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
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
6791230320
Combine SetupWorkingDirectory for Linux and Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-05 10:27:10 -08:00
d4c8d0519d
Merge pull request #20011 from Microsoft/MinimalBaseImage
...
Move base image selection to a utility function
2016-02-04 18:06:30 -08:00
2da5ad3bb0
Merge pull request #20005 from Microsoft/jjh/testrunrestartmaxretries
...
Windows CI: Up timeout TestRunRestartMaxRetries
2016-02-04 16:07:42 -08:00
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
18204ea616
Merge pull request #19357 from chenchun/internal
...
Display `internal` flag on `network inspect`
2016-02-04 16:31:12 -05:00
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
4a2122e020
Windows CI: Up timeout TestRunRestartMaxRetries
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-04 11:59:13 -08:00
fe53be4e17
Apply context changes to the client.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-04 13:59:57 -05:00
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
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
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
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
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
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
f0a58947ab
Merge pull request #19979 from mavenugo/gccgoci
...
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
2016-02-03 20:33:52 -05:00
76a765140e
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-02-03 14:44:55 -08:00
fdcce4ac03
Merge pull request #19942 from LK4D4/fix_vet_errors
...
Fix minor vet warnings
2016-02-03 13:31:11 -08:00
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
28a7577a02
Merge pull request #19959 from WeiZhang555/fix-cli-print-err
...
Remove redundant error message
2016-02-03 10:56:19 -08:00
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
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
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
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
4ef06e9ef1
Merge pull request #19946 from Microsoft/jjh/stats
...
Windows: Turn off stats
2016-02-03 09:28:25 +01:00
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
6b8341a2d5
Disable flakey TestClientSetsTLSServerName
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 19:56:31 -08:00
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
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
55268f4e91
Windows: Turn off stats
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 17:59:11 -08:00
6f88a3d7d3
Merge pull request #19939 from Microsoft/jjh/testcreate
...
Windows CI: TestCreate* porting
2016-02-02 17:48:43 -08:00
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
1bc4c99372
Merge pull request #19761 from HackToday/enhancesortattr
...
Sort the attributes for events
2016-02-02 16:08:23 -08:00
5e3fdd3c20
Windows CI: TestCreate* porting
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 16:00:39 -08:00
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
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
01cc315322
Merge pull request #19800 from wenchma/19425-TestApiStatsNetworkStats
...
Optimize TestApiStatsNetworkStats and TestApiStatsNetworkStatsVersioning
2016-02-02 14:56:51 -08:00
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
f830cec78a
Merge pull request #19868 from HackToday/fixwindows
...
Fix windows CI test
2016-02-02 19:58:29 +01:00
7abc7b383c
Merge pull request #18605 from fgimenez/9969-add-sni-support
...
Added cli SNI integration test
2016-02-02 10:12:44 -08:00
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
5cdc0dfce3
Merge pull request #19822 from Microsoft/jjh/testexeccli
...
Windows CI: Initial porting CLI TestExec*
2016-02-02 08:32:28 +01:00
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
a39ad952ec
Merge pull request #19889 from Microsoft/jjh/reliabilitytake2
...
Windows CI: TP4 reliability hack
2016-02-01 22:30:51 -05:00
2ebcb48cf1
Windows CI: TP4 reliability hack
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-01 18:02:57 -08:00
Aaron Lehmann
Antonio Murdaca
Kai Qiang Wu(Kennan)
Phil Estes
Michael Crosby
Alexander Morozov
Arnaud Porterie
Tonis Tiigi
Alexander Morozov
Darren Stahl
Antonio Murdaca
Jess Frazelle
David Calavera
Morgan Bauer
Brian Goff
Christopher Jones
Jessica Frazelle
Victor Vieux
Aidan Hobson Sayers
Vincent Demeester
Stefan Scherer
Tibor Vass
Kenfe-Mickael Laventure
Shishir Mahajan
Liron Levin
Stephen Rust
John Howard
Phil Estes
Chun Chen
Madhu Venugopal
Sebastiaan van Stijn
Zhang Wei
Alessandro Boch
Wen Cheng Ma