281c1ced6d
Windows CI: Port docker_cli_restart_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-24 15:21:56 -08:00
00f65ae810
Windows CI: Port TestLogsAPI*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-24 13:43:52 -08:00
03e2ff322b
Windows CI: Port TestKill*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-24 13:33:25 -08:00
6a931c3590
Windows CI: Integrity check for busybox top
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-24 11:00:47 -08:00
467c8b1a6a
Merge pull request #20637 from Microsoft/jjh/fixteststartattachmultiplecontainers
...
Windows CI: Fix TestStartAttachMultipleContainers
2016-02-24 08:46:00 -08:00
5fdfb2985b
Merge pull request #20619 from Microsoft/jjh/useraccounts
...
Windows: Updates for virtual user account
2016-02-24 13:48:27 +01:00
034a1a8dfd
Merge pull request #20017 from calavera/expose_volumes_in_ps
...
Add mounts to docker ps.
2016-02-24 11:08:21 +01:00
fa3b197157
Restore container configs when update failed
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-02-24 14:23:48 +08:00
8ae6f6ac28
Support update swap memory only
...
We should support update swap memory without memory.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-02-24 13:36:47 +08:00
ef9f13af3d
Windows CI: Fix TestStartAttachMultipleContainers
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-23 16:24:35 -08:00
3abf2a7741
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>
2016-02-23 15:26:26 -05:00
0a7755ab4e
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>
2016-02-23 09:51:09 -08:00
800c9e81ea
Windows: Updates for virtual user account
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-23 09:47:52 -08:00
bd4fb00fb6
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>
2016-02-23 12:10:24 -05:00
9d882cbb44
Merge pull request #20581 from stweil/master
...
Fix some typos in comments and strings
2016-02-23 08:20:53 -08:00
8474bbff45
Fix typo
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-02-23 17:27:55 +08:00
2eee613326
Fix some typos in comments and strings
...
Most of them were found and fixed by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-22 20:27:15 +01:00
4781d5c4fb
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)
2016-02-20 20:19:54 -06:00
076b3558fc
Merge pull request #20509 from estesp/cleanup-authz-test
...
Clean up authz integration-cli test
2016-02-20 12:10:29 +01:00
ff3ea4c90f
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>
2016-02-20 17:06:32 +08:00
3d65e7126c
Merge pull request #20446 from estesp/fix-userns-cp
...
Fix copy chown settings to not default to real root
2016-02-19 19:45:44 -05:00
fe015c5ce0
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)
2016-02-19 18:44:36 -06:00
b9195cd6d4
Merge pull request #20464 from cpuguy83/fix_events_flakiness
...
Fix events test flakiness.
2016-02-19 15:39:27 -08:00
11435b674b
add seccomp default profile fix tests
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-19 13:32:54 -08:00
0e72550c5b
Merge pull request #20383 from HackToday/addsort
...
Make network ls output order
2016-02-19 15:42:48 -05:00
48701888c2
Merge pull request #20389 from HackToday/addvolumesupport
...
Make volume ls output order
2016-02-19 15:41:34 -05:00
6e0f873f05
Temporarily skip TestAuthZPluginAllowEventStream
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-19 10:32:05 -08:00
074561b0ec
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)
2016-02-19 10:12:39 -08:00
117a982d2e
Merge pull request #20419 from aboch/cr
...
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
2016-02-18 17:39:46 -08:00
c96564a76c
Merge pull request #20433 from runcom/fixies
...
runconfig: opts: parse: lowercase errors
2016-02-18 17:08:01 -08:00
40be5dba47
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)
2016-02-18 14:44:13 -08:00
abbf2aa6dd
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>
2016-02-18 16:10:29 -05:00
c9bec2be2a
Config-reload IT
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-02-18 12:22:56 -08:00
e5293f97f2
IT case for sending invalid query to embedded DNS server
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-02-18 12:14:19 -08:00
038c3b8287
Merge pull request #20426 from calavera/remove_channel_close
...
Remove channel close.
2016-02-18 11:13:30 -08:00
2e6c841b82
Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge
...
Expose bridge IPv6 setting to `docker network inspect`
2016-02-18 10:35:04 -08:00
2f283f3cd8
Merge pull request #20447 from cpuguy83/fix_netnone
...
Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError
2016-02-18 10:10:26 -08:00
e7b2523751
Merge pull request #20442 from cpuguy83/fix_flakey_TestAuthZPluginAllowEventStream
...
Fix flakey TestAuthZPluginAllowEventStream
2016-02-18 12:07:20 -05:00
8e0e9e0f24
Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError
...
Broken by bcb9adf49e
2016-02-18 11:34:34 -05:00
4cf9b725f2
Fix flakey TestAuthZPluginAllowEventStream
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-18 10:19:19 -05:00
d266142230
runconfig: opts: parse: lowercase errors
...
also fix wrong function comment
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-18 11:21:44 +01:00
0109510830
Remove channel close.
...
Send a message instead, discarding duplicated messages.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-17 22:52:06 -05:00
e9234d8aaf
Merge pull request #20411 from aaronlehmann/strengthen-TestPullFromCentralRegistryImplicitRefParts
...
Improve resilience of TestPullFromCentralRegistryImplicitRefParts
2016-02-17 15:08:20 -08:00
8842011153
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>
2016-02-17 13:08:51 -08:00
0cc9720c2a
Merge pull request #20406 from aaronlehmann/integration-test-format-string
...
Fix format string in TestExecApiCreateContainerPaused
2016-02-17 11:28:42 -08:00
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
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
a898478a79
Merge pull request #19570 from WeiZhang555/18679-flaky-test
...
Fix flaky test `TestGetContainerStatsRmRunning`
2016-02-01 13:15:20 -08:00
c28bba0460
Merge pull request #19725 from WeiZhang555/opt-TestRunSeccompDefaultProfile
...
Optimize `TestRunSeccompDefaultProfile`
2016-02-01 16:01:51 -05:00
0c620d62c2
Merge pull request #19708 from wenchma/19425-TestDaemonCorruptedLogDriverAddress
...
Optimize slow bottleneck tests of TestDaemonCorruptedLogDriverAddress
2016-02-01 12:59:37 -08:00
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
a9379b4af2
Windows CI: Initial porting CLI TestExec*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-01 10:19:21 -08:00
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
695b7e8d11
Optimize TestApiStatsNetworkStats and TestApiStatsNetworkStatsVersioning
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-02-01 10:26:27 +08:00
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
59f4369f1a
Windows CI: Turn off unreliable TP4 tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-31 15:51:56 -08:00
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
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
4ba168b4cb
Added cli SNI integration test
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2016-01-30 15:29:24 +01:00
667c2245ad
Merge pull request #19820 from Microsoft/jjh/testexecapi
...
Windows CI: Port TestExecApi* tests
2016-01-30 11:50:01 +01:00
98ef10f64e
Merge pull request #19839 from Microsoft/jjh/testevents
...
Windows CI: Porting TestEvents*
2016-01-30 11:47:44 +01:00
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
2e9bb7870a
Optimize `TestRunSeccompDefaultProfile`
...
Optimize performance of `TestRunSeccompDefaultProfile`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-30 10:42:06 +08:00
9c3cca23e9
Merge pull request #19815 from Microsoft/jjh/testruncreatevolumesinsymlinkdir
...
Fix TestRunCreateVolumesInSymlinkDir
2016-01-29 21:07:51 -05:00
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
35ef3efe9a
Merge pull request #19805 from WeiZhang555/test-inspect
...
Make test code consistent
2016-01-29 12:43:58 -08:00
bf33742026
Windows CI: Porting TestEvents*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-29 12:33:56 -08:00
90b0292b5b
Fix TestRunCreateVolumesInSymlinkDir
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-29 09:28:48 -08:00
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
5f63c54192
Merge pull request #19790 from Microsoft/CombineSetupWorkingDir
...
Combine SetupWorkingDirectory for Linux and Windows
2016-01-29 08:52:08 +01:00
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
9642c8170a
Windows CI: Port TestExecApi* tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-28 16:26:06 -08:00
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
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
ec31741ca1
Combine SetupWorkingDirectory for Linux and Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-01-27 16:17:35 -08:00
0f5aa19593
Merge pull request #19767 from icecrime/factorize_sleeping_container
...
Factorize sleeping containers
2016-01-27 13:42:56 -08:00
c39c7e6edf
Merge pull request #19760 from cyli/re-vendor-notary
...
Re-vendor Notary and docker/go
2016-01-27 09:36:26 -08:00
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
c1b168664f
Merge pull request #19764 from Microsoft/jjh/testinspectapi
...
Windows CI: PortTestInspectApi*
2016-01-27 14:08:28 +01:00
3c61f00616
Windows CI: PortTestInspectApi*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 20:23:40 -08:00
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
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
603c04a789
Merge pull request #19744 from Microsoft/jjh/testhistory
...
Windows CI: Enable TestHistory* cli tests
2016-01-26 19:08:33 -08:00
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
70c5e96cb8
Merge pull request #19604 from Microsoft/jjh/testrename
...
Windows CI: Fix TestRename*
2016-01-26 19:03:31 -08:00
51d4d8eff2
Merge pull request #19603 from Microsoft/jjh/testps
...
Windows CI: Address simple failures in TestPS*
2016-01-26 19:01:17 -08:00
9b82174f93
Merge pull request #19742 from Microsoft/jjh/testrmi
...
Windows CI: Port TestRmi tests
2016-01-26 21:46:35 -05:00
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
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
0b248e88ff
Merge pull request #19734 from Microsoft/jjh/testtag
...
Windows CI: Port TestTag* cli tests
2016-01-26 22:56:36 +01:00
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
15c32f39a9
Windows CI: Enable TestHistory* cli tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 12:42:09 -08:00
94e5fab5ed
Windows CI: Port TestRmi tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 12:22:37 -08:00
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
1723c6477f
Windows CI: Port TestTag* cli tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 10:41:31 -08:00
c56e309d05
Merge pull request #19712 from runcom/test-requires-apparmor
...
integration-cli: require Apparmor
2016-01-26 09:18:29 -08:00
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
7a97e938e2
Merge pull request #19490 from cyphar/remove-dockerinit
...
Remove dockerinit once and for all
2016-01-26 08:27:35 -08:00
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
fc8e344297
Merge pull request #19715 from coolljt0725/fix_test_daemon
...
Test utils: fix daemon start utils
2016-01-26 10:08:50 -05:00
e5b5c0ebe8
Merge pull request #19713 from WeiZhang555/opt-TestEventsContainerFailStartDie
...
Optimize `TestEventsContainerFailStartDie`
2016-01-26 09:32:52 -05:00
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
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
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
4f7dda3fb2
Optimize `TestEventsContainerFailStartDie`
...
Optimize performance of `TestEventsContainerFailStartDie`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-26 19:23:18 +08:00
7ac8c77877
integration-cli: require Apparmor
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-26 11:57:14 +01:00
613e91f36f
Merge pull request #19703 from mountkin/speedup-TestEventsAttach
...
optimize DockerSuite.TestEventsAttach
2016-01-26 11:41:31 +01:00
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
77a0f77e7f
optimize DockerSuite.TestEventsAttach
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-01-26 10:45:45 +08:00
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
2cb8fdd327
Merge pull request #19673 from aboch/epcs
...
Save endpoint config only if endpoint creation succeeds
2016-01-25 16:50:47 -08:00
f7abff4f81
Merge pull request #19560 from aboch/mn
...
Reject multiple networks on container creation request
2016-01-25 14:57:51 -08:00
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
cf44f17258
Merge pull request #19619 from WeiZhang555/test-bottleneck-oomtrue
...
Optimize TestEventsOOMDisableTrue
2016-01-25 14:24:46 -08:00
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
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
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
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
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
cfa515fd9d
Reject multiple networks on container creation
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-25 12:50:01 -08:00
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
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
997e61add9
Merge pull request #19658 from wenchma/19425-daemon_ipv6
...
Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR
2016-01-25 14:04:54 -05:00
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
c983996e0b
speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-01-25 23:45:13 +08:00
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
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
717ced8dd7
Merge pull request #19602 from Microsoft/jjh/testrunexitonstdinclose
...
Windows CI: Fix TestRunExitOnStdinClose flakiness
2016-01-23 18:53:28 -08:00
75d107451a
Windows CI: Address simple failures in TestPS*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-23 16:33:45 -08:00
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
2b0a742237
Windows CI: Fix api_containers_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-23 14:40:25 -08:00
11a51649cf
Update registry version in Dockerfile.armhf
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-23 18:46:46 +01:00
f21fb2162e
Windows CI: Fix TestRename*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-23 09:25:10 -08:00
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
7be8f72644
Merge pull request #19600 from aaronlehmann/buildenvusage2
...
Slight TestBuildEnvUsage2 speedup
2016-01-22 20:38:45 -08:00
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
4bfc5d4606
Windows CI: Fix TestRunExitOnStdinClose
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-22 18:27:15 -08:00
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
6d1455e74b
Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer
...
Hotfix vendor libcontainer
2016-01-22 16:46:04 -08:00
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
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
504a8ad295
Merge pull request #19567 from Microsoft/jjh/testpsnotshowportsofstoppedcontainer
...
Windows: TestPsNotShowPortsOfStoppedContainer linux only
2016-01-22 21:53:31 +01:00
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
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
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
a9fc4939df
Merge pull request #19573 from sanimej/libn
...
Vendor in libnetwork v0.6.0-rc2
2016-01-22 12:07:40 -05:00
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
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
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
845dc1b24c
Windows: TestPsNotShowPortsOfStoppedContainer linux only
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-21 18:48:21 -08:00
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
3b0d36dbc1
Move ErrUnsupportedNetwork* checks to updateNetworkConfig() func
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-21 10:56:01 -08:00
473a32ba8f
Windows: Fix TestLinksMultipleWithSameName
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-21 09:52:49 -08:00
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
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
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
bb8d8a645a
Merge pull request #19430 from keloyang/StatsNoStreamGetCpu
...
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
2016-01-21 09:07:00 +08:00
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
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
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
fd79462af3
Merge pull request #19044 from HackToday/18890-validate-volume
...
Fix volume filter validation
2016-01-20 09:56:30 -08:00
acb42c5fab
Enable DockerTrustSuite for ARM again
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-20 14:58:09 +01:00
87b7ff5267
Merge pull request #19465 from mavenugo/sysd
...
Vendor libnetwork v0.6.0-rc1
2016-01-20 09:02:21 +01:00
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
8799218d01
IT for remote network driver & ungraceful restart
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-19 14:09:11 -08:00
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
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
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
42ee908b3f
Merge pull request #19431 from WeiZhang555/19422-default-network
...
bugfix: prevent creating network 'default'
2016-01-19 14:18:20 +08:00
d474f7fb86
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
...
Signed-off-by: yangshukui <yangshukui@huawei.com>
2016-01-19 12:06:01 +08:00
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
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
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
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
f1c6cd57fa
Merge pull request #19320 from cilium-team/fixing-inspect-api-container-volume-driver
...
Fixing TestInspectApiContainerVolumeDriver
2016-01-16 01:04:32 -08:00
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
b63b43dc4c
Merge pull request #19219 from runcom/add-log
...
integration-cli: log error when starting registry
2016-01-15 09:44:47 -08:00
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
4c89b1f72c
Merge pull request #19355 from riyazdf/notary-revendor
...
notary revendor into docker
2016-01-15 01:02:35 -08:00
bca9415b52
Merge pull request #19356 from sanimej/restart
...
Vendoring libnetwork v0.5.6
2016-01-15 09:32:53 +01:00
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
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
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
94b2d56690
Merge pull request #19109 from BrianBland/crossRepositoryPush
...
Cross repository push
2016-01-14 18:50:53 -05:00
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
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
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
d3392a3bde
Windows: Fix test regression from 19155
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-14 12:00:27 -08:00
662cac08ef
Add IPAM Config Options to match libnetwork
...
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-14 14:32:25 -05:00
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
7cd6210a88
Merge pull request #19326 from HackToday/19153-filter-rethink
...
Fix image filter
2016-01-14 13:59:14 -05:00
73a5393bf3
Merge pull request #19242 from mavenugo/nsalias
...
Network scoped alias support
2016-01-14 10:58:51 -08:00
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
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
dda513ef65
Network scoped alias support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-14 08:44:41 -08:00
349d9700bd
Merge pull request #19291 from coolljt0725/fix_19100
...
Fix #19100 and fix a typo
2016-01-14 11:40:29 -05:00
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
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
3d2539d39d
Fix #19100 and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-14 14:58:54 +08:00
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
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
John Howard
Arnaud Porterie
Sebastiaan van Stijn
Qiang Huang
Christopher Jones
David Calavera
Wen Cheng Ma
Stefan Weil
Phil Estes
Antonio Murdaca
Zhang Wei
Tibor Vass
Antonio Murdaca
Brian Goff
Madhu Venugopal
Santhosh Manohar
Aaron Lehmann
Alexander Morozov
Kai Qiang Wu(Kennan)
Phil Estes
Michael Crosby
Tonis Tiigi
Alexander Morozov
Darren Stahl
Jess Frazelle
Morgan Bauer
Jessica Frazelle
Victor Vieux
Aidan Hobson Sayers
Vincent Demeester
Stefan Scherer
Kenfe-Mickael Laventure
Shishir Mahajan
Liron Levin
Stephen Rust
Chun Chen
Alessandro Boch
Federico Gimenez
Doug Davis
cyli
Bryan Boreham
Lei Jitang
Aleksa Sarai
Shijiang Wei
Brian Bland
Sebastiaan van Stijn
yangshukui
Riyaz Faizullabhoy
Ryan Belgrave
André Martins