Commit Graph

2833 Commits

Author SHA1 Message Date
6be195136a Sixth set of TestBuild CI Enabling for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 5fc0de2688da4fbe010980a832d8f73bff4be444
Component: engine
2016-02-13 20:54:59 -08:00
05e211a98f Merge pull request #20290 from calavera/fix_stop_signal_merge
Inherit StopSignal from Dockerfile.
Upstream-commit: 5a9a435d40fb238b627c9e31858b6e31ae38ec53
Component: engine
2016-02-13 09:26:11 +01:00
98ffe8be11 Merge pull request #20198 from cpuguy83/check_drivers_b4_vol_create
Check drivers before vol create
Upstream-commit: 79edcc517231e46d1fa9e03081488527143eefae
Component: engine
2016-02-12 18:41:48 -05:00
1f2b78374a Merge pull request #20278 from aaronlehmann/build-authconfig
Pass authentication credentials through to build
Upstream-commit: 64a4605892d8bcc43c73948349bcfede14eb8c3a
Component: engine
2016-02-12 18:37:49 -05:00
663efc4f39 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>
Upstream-commit: a252516ec19c9c83055a882da894712f2e812ecc
Component: engine
2016-02-12 17:56:40 -05:00
5d5044b24f 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>
Upstream-commit: 6fed46aeb97943315aed12f2dc62565f7bcc53dc
Component: engine
2016-02-12 10:50:16 -08:00
cacd57e1c5 Merge pull request #20261 from tophj-ibm/change-test-to-use-variable
Change integration test to use declared variable
Upstream-commit: fffff202fcc3dc63f72ce883d728eb5149e9f1ce
Component: engine
2016-02-12 07:52:51 -08:00
cf164a7258 Merge pull request #20256 from jfrazelle/make-tests-faster
make tests faster no apt-key
Upstream-commit: 3723013a1fd5b747b4a059b86fa9e006d35af007
Component: engine
2016-02-11 22:01:13 -05:00
f115ec243c 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>
Upstream-commit: ce1059973a4a46acc272a8c0fea521c96e628ba7
Component: engine
2016-02-11 21:20:00 -05:00
992182031d Merge pull request #20250 from vieux/fix_misspell
fix common misspells
Upstream-commit: 5ca6d3bafd0dd53dd26f8251218c68a8016e5ce7
Component: engine
2016-02-11 17:22:06 -08:00
748967285d make tests faster no apt-key
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0d02f2a0118f7647876e1ce5c19874ea0dd06bd8
Component: engine
2016-02-11 16:28:00 -08:00
5cfbe3cee6 Merge pull request #20246 from tophj-ibm/19368-fix-flaky-network-test
Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart
Upstream-commit: 46ec01bd125319635b9700c67032ec097e9a25b8
Component: engine
2016-02-11 15:50:40 -08:00
697a990701 fix common misspell
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 99a396902f0ea9d81ef87a683489b2435408f415
Component: engine
2016-02-11 15:49:36 -08:00
8be99d9bc5 Merge pull request #20218 from icecrime/fix_remote_integration-cli
Improve remote integration-cli tests
Upstream-commit: 4cdd0403cdaac7e500f3fa6740c43792a6e066a4
Component: engine
2016-02-11 22:51:20 +01:00
6d38af4937 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>
Upstream-commit: 045aee2002e76cbfc9999472fe6e8fc54e0c0085
Component: engine
2016-02-11 16:47:40 -05:00
b27ac0630e Merge pull request #20209 from aaronlehmann/upper-case-hostnames
Allow uppercase characters in image reference hostname
Upstream-commit: acd8baccff10642e1d44a342414cd196b81a4605
Component: engine
2016-02-11 10:50:05 -05:00
47f5776cce 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>
Upstream-commit: a943c401509e7994ae5c574a4b7e23354e44a105
Component: engine
2016-02-11 07:31:49 -08:00
91c83926d7 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>
Upstream-commit: 3403a01b07a73defe9f15c30e16ec8dfcab50439
Component: engine
2016-02-10 20:43:20 -05:00
13ec79c31c 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>
Upstream-commit: 00ec6102d993a752bd8dfb4ee393a4e58e59a4fe
Component: engine
2016-02-10 20:43:15 -05:00
c35751d5f0 Merge pull request #20170 from Microsoft/10662-TestBuildCI5
Fifth set of TestBuild CI enables for Windows
Upstream-commit: 9be87be582f1c4539e84385c1ac917418c015cdd
Component: engine
2016-02-10 16:02:26 -08:00
176a1e6aa2 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>
Upstream-commit: e2afab9c4a8be800dffee9b60b2197350987543c
Component: engine
2016-02-10 14:03:41 -08:00
291efe0a93 Merge pull request #19814 from Microsoft/10662-TestBuildCI3
Third set of TestBuild* CI enabling for Windows
Upstream-commit: ab0102d671d9d531f99e176858ec5b2506bc77e3
Component: engine
2016-02-10 21:49:39 +01:00
104ddcecd2 Fifth set of TestBuild CI enables for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 0adcce10a1b9373c0926eaee1269f50765a49f02
Component: engine
2016-02-10 12:37:58 -08:00
f6ab952c46 Merge pull request #20183 from hypriot/fix-20002-for-multiarch
Fix TestAuthZPluginAllowEventStream for multiarch
Upstream-commit: 7e44d0ca5872290a9b56c0a381bc370a3ffbc603
Component: engine
2016-02-10 09:42:35 -05:00
403bf945a4 Merge pull request #20174 from tophj-ibm/remove-power-from-logrus-tests
PPC64LE: Remove testing logrus output from ppc64le
Upstream-commit: cfa806378eafd159fce4b1158b215564419680d0
Component: engine
2016-02-10 09:07:47 -05:00
31c6500d5a Fix TestAuthZPluginAllowEventStream for multiarch
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 36a974a1a6267828b773de19ed298947c66c4945
Component: engine
2016-02-10 07:28:50 +01:00
c88ca91e41 Merge pull request #20135 from vdemeester/20087-fix-since-before-filters
Fix the since and before filter behavior
Upstream-commit: 61efb4d08487623474d6c21d68b0b34a2117da67
Component: engine
2016-02-09 21:13:00 -05:00
9394f6b721 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
Upstream-commit: 321f2913241145061088769ab887ec7c27a87c70
Component: engine
2016-02-09 17:30:48 -08:00
6d4102dcb8 Merge pull request #20133 from mlaventure/dont-bind-mount-mqueue
Prevent mqueue from implicitely becoming a bind mount with --ipc=host
Upstream-commit: 0b4a7fb06d4b77265831cee1508aad9fbeddb7a2
Component: engine
2016-02-09 19:55:57 -05:00
dd3f7fc6e9 Third set of TestBuild* CI enabling for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 4603a7259e133f5fdcb9e7856ca857338b26dd38
Component: engine
2016-02-09 15:19:38 -08:00
7d8fc9149c Merge pull request #19985 from Microsoft/CombineSetupWorkingDir
Combine SetupWorkingDirectory for Linux and Windows
Upstream-commit: d6870238e329e43d2df291a5f82d27929f9a192d
Component: engine
2016-02-09 15:18:49 -08:00
8072979e73 Merge pull request #18943 from cpuguy83/fix_write_flusher
Remove Exists from backend
Upstream-commit: b3cb0d196d17aa04ca98292536b1f66e4490bbc5
Component: engine
2016-02-09 15:16:03 -08:00
7d5beb3fd8 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>
Upstream-commit: 736e93a468fe8b8530ec5d00b9be7bbd53e306fc
Component: engine
2016-02-09 18:02:18 -05:00
53c71bfb0a Merge pull request #20059 from Microsoft/10662-TestBuildCI4
Fourth set of enabling Builder CI tests for Windows
Upstream-commit: 08d0a8384fdacf3fbb9230194efa18e91e382d56
Component: engine
2016-02-09 23:19:28 +01:00
a7fd8e1725 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>
Upstream-commit: dba5a7f243e6c251176585571419b595172e9402
Component: engine
2016-02-09 14:16:08 -08:00
24558a48dd 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>
Upstream-commit: f7d4abdc00d521509995da1070215c808fe0fd9c
Component: engine
2016-02-09 14:16:08 -08:00
d949b11a4e Fix horribly broken TestGetContainerStatsNoStream
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3434860d54d547167d08fdcf3aefaaab06aff2c0
Component: engine
2016-02-09 14:25:05 -05:00
d2b4b76ae0 Merge pull request #19983 from srust/volume_get_compat_hack
[1.10] Fix volume driver API compatibility mode (a little)
Upstream-commit: 10226ac845e5a13350c5c4e5667cc2602c196112
Component: engine
2016-02-09 10:47:30 -08:00
cac10ff771 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>
Upstream-commit: 07184599f71af0ef5b29d025bf1eae6432ae37f3
Component: engine
2016-02-09 10:47:31 -05:00
05a9f24f32 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>
Upstream-commit: b41dba58a01855e0d222bd6c14af9874c298c154
Component: engine
2016-02-09 09:26:20 +01:00
67892dedf8 Move userns cli test to a separate file, remove experimental flag
Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: df636ef45addcb6ff2555e3da2bc61fc25cc5603
Component: engine
2016-02-09 09:31:09 +02:00
4075818bf4 Fix volume driver API compatibility mode (a little)
Signed-off-by: Stephen Rust <srust@blockbridge.com>
Upstream-commit: c3985bdf797a4526eac5fb0bd92047ac0f8513d9
Component: engine
2016-02-08 23:12:29 -05:00
d5f0b4ca87 Merge pull request #20002 from twistlock/19575_authz_plugin_support_events
Fix 19575: Docker events doesn't work with authorization plugin
Upstream-commit: 862f073694e3b60b89e099cdf12cfb8ec1a6a9e8
Component: engine
2016-02-08 09:10:39 -08:00
7d584ec835 Fourth set of enabling Builder CI tests for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: eed648ac5ac50a17a5202bd7a0b00738727f9e0f
Component: engine
2016-02-05 17:46:06 -08:00
3e59ad891c 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>
Upstream-commit: 5ffc810df22c3779b4df8ce28d94e4bf89d34e2f
Component: engine
2016-02-05 22:30:01 +02:00
2fc41c0b8b Combine SetupWorkingDirectory for Linux and Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 6791230320fa9f8ae9df3e90d5c52d85621828a0
Component: engine
2016-02-05 10:27:10 -08:00
78c9a12642 Merge pull request #20011 from Microsoft/MinimalBaseImage
Move base image selection to a utility function
Upstream-commit: d4c8d0519d2e521fd8b364d7231973455963e0ba
Component: engine
2016-02-04 18:06:30 -08:00
dc25bc1e26 Merge pull request #20005 from Microsoft/jjh/testrunrestartmaxretries
Windows CI: Up timeout TestRunRestartMaxRetries
Upstream-commit: 2da5ad3bb0fb553112751a683ac861ab8fd5b8e2
Component: engine
2016-02-04 16:07:42 -08:00
495762f74d Move base image selection to a utility function
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 96c522162634ff4d5e55ddf2ff841921a99b7b09
Component: engine
2016-02-04 15:06:34 -08:00
36dd8337c1 Merge pull request #19357 from chenchun/internal
Display `internal` flag on `network inspect`
Upstream-commit: 18204ea61690797930efcf2d0a638961664ba0df
Component: engine
2016-02-04 16:31:12 -05:00